Xss Vulnerability Ack

Merged Marin Jankovski requested to merge xss_vulnerability_ack into master