Add the rest of the user settings screens
Merge branch 'master' of https://github.com/cipele46/cipele46-android
Merge branch 'master' of https://github.com/cipele46/cipele46-android