Merging settings branch in to Master

Conflicts:
	mobile/src/main/AndroidManifest.xml