Finished events and comments
Merge branch 'master' of https://github.com/rienderien/plop

Conflicts:
	app/app.php
	app/templates/views/place.php
	src/Model/DataMappers/EventDataMapper.php