nn
Merge branch 'master' of git@github.com:momoplan/petandroid1.git

Conflicts:
	src/petcircle/yl/utils/xmpp/XmppService.java
Merge branch 'master' of git@github.com:momoplan/petandroid1.git