Make the escapeMarkup function escape html tags and some other characters and apply it to usefull places
Merge pull request #691 from jelte12345/master

Fix XSS injection