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

Conflicts:
	src/petcircle/yl/AsyncTask/OpenActivity.java
	src/petcircle/yl/network/HttpService.java
	src/petcircle/yl/ui/MainActivity.java
	src/petcircle/yl/ui/StartActivity.java
	src/petcircle/yl/utils/xmpp/UserService.java
nn