now you can set your username
now you can set your username
misc fix
misc fix
required public static for setUsername
misc
removed bs
Merge remote-tracking branch 'origin/master'

Conflicts:
	androidapp/src/com/activities/Activity_ContactList.java