Android Client: improvements to settings
Merge branch 'mobile' of https://github.com/EmchBerger/testmanager into mobile

Conflicts:
	androidClient/TestManager/.idea/workspace.xml