Removed custom nl2br and replaced with twig built in one and removed raw filter so output is escaped properly.
Merge branch 'JOINDIN-432' of github.com:gargoyle/joindin-web2 into pr163
Merge branch 'pr163'