Auth token saved in shared Prefs.
Merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml