First working version :)
Merge branch 'master' of github.com:magnet-cl/AndroidUserManager

Conflicts:
	.gitignore