Escape characters to mitigate XSS attacks
Merge branch 'abstractj-AEROGEAR-714'