Merge branch 'master' of github.com:ArtisanMobile/SampleAndroidAppWithArtisan into upgrade-to-2-1-3
Merge branch 'upgrade-to-2-1-3' of github.com:ArtisanMobile/SampleAndroidAppWithArtisan into upgrade-to-2-1-3