This version might actually start
Merge branch 'master' of https://github.com/sandbergnilsvictor/MahAppStudent

Conflicts:
	res/layout/activity_ad_ladok_test.xml
	src/se/mah/kd330a/project/framework/SplashActivity.java

Ok.