lulz
Merge branch 'master' of https://github.com/Frotty/EBR

Conflicts:
	wurst/escaper/Escaper.wurst
git push