Add initial user settings activity and fragment
Add support for multiple user screens
Merge branch 'master' of https://github.com/cipele46/cipele46-android into user-settings

Conflicts:
	AndroidManifest.xml
Merge pull request #1 from cipele46/user-settings

Add initial user settings activity and fragment