Thema update
Merge branch 'master' of https://github.com/jasperberg/appinf1a

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/layout/activity_main.xml