merge
Merge branch 'master' of https://github.com/eventplaner/eventplaner

Conflicts:
	app/src/ch/hackathon/eventplaner/logic/EventManager.java