Q&A Start
Merge branch 'master' of https://github.com/KingApollo/RIKapp2

Conflicts:
	RIKapp/AndroidManifest.xml
	RIKapp/res/layout/activity_rikapp_main.xml
	RIKapp/res/values/strings.xml
	RIKapp/src/dk/ucn/datamatiker/rikapp/RIKappMainActivity.java