asdghadsfh
Merge branch 'master' of https://github.com/choifish/anon.git

Conflicts:
	src/com/anon/GroupsActivity.java
Merge branch 'master' of https://github.com/choifish/anon.git