no message
Merge branch 'master' of https://github.com/gollabaer/SoftewareEngineering

Conflicts:
	res/layout/activity_main.xml