get user name and token
add get token and user
Merge branch 'develop' of github.com:yukuku/androidbible-sync into develop

Conflicts:
	.idea/modules.xml