Merge from Dev

Conflicts:
	app/AndroidManifest.xml
	app/res/values/strings.xml
	app/src/se/chalmers/agile5/MyActivity.java