usage of nl2br; some basic xss protection
Merge branch 'master' of https://github.com/binarious/meditation-plus-server into binarious-master

Conflicts:
	profile.php
Merge branch 'binarious-master'