user
remove xmpp
token
test
friend
group
Merge branch 'mysql_branch' of https://github.com/power--/home into
mysql_branch

Conflicts:
	service/pom.xml
	service/src/test/java/com/goparty/client/UserAndEventTest.java