Fixed basic admin and basic settings.
Fixed basic admin and basic settings.
Merged with Marcus version.
Merge branch 'master' of https://github.com/Hyperactivity/android-app