Merge pull request #2 from ArtisanMobile/upgrade-to-2-1-3

ULTRA-213 Added profile settings screen
Merge branch 'master' of github.com:ArtisanMobile/SampleAndroidAppWithArtisan into upgrade-to-2-1-3