Fix some & and &amp; errors
added introtext to editvenue/editevent, REF #576
Merge branch 'master' of https://github.com/jemproject/JEM-Project
added metadata to event-view (backend)
Replace htmlspecialchars() with $this->escape() #577
Renamed confusing variable
Added to dos
Merge branch 'master' of https://github.com/jemproject/JEM-Project
Merge branch 'master' into develop
Merge branch 'develop' into feature/page-heading

Conflicts:
	site/views/attendees/tmpl/default.php