Initial cleanup

Conflicts:
	AndroidManifest.xml
	res/xml/navbar_settings.xml
	res/xml/preference_headers.xml