Layout
Navigation
Merge branch 'master' of https://github.com/neniman/unimon.git

Conflicts:
	res/layout/activity_main.xml
	res/menu/main.xml
	res/values/strings.xml
	src/de/ur/unimon/appstart/StartScreenActivity.java