"add user" somewhat works
Merge branch 'origin/master'

Conflicts:
	televernote/AndroidManifest.xml