updata
Merge branch 'master' of github.com:momoplan/petandroid1

Conflicts:
	src/petcircle/activity/message/MessageListActivity.java
	src/petcircle/data/service/XmppService.java
Merge branch 'master' of github.com:momoplan/petandroid1
Merge branch 'master' of github.com:momoplan/petandroid1
Merge branch 'master' of github.com:momoplan/petandroid1
Merge branch 'master' of github.com:momoplan/petandroid1
Merge branch 'master' of github.com:momoplan/petandroid1
updata