Fix XSS injections again....
Merge branch 'master' of github.com:v1kko/SWE_2013_Groep2