Added settings stubs.
Cleaned a little
Revised all settings xmls. Haven't updated java to match yet- won't compile.
Java updated for settings.
Settings/UI updates
Merging settings branch in to Master

Conflicts:
	mobile/src/main/AndroidManifest.xml