login anim
Merge branch 'master' into animation

Conflicts:
	AndroidManifest.xml