Some deletions

Conflicts:
	Mpp_Project/AndroidManifest.xml
	Mpp_Project/res/values/strings.xml
	Mpp_Project/src/dk/aau/mpp_project/fragment/SettingsFragment.java