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

Conflicts:
	src/petcircle/yl/ui/MainActivity.java
1
120
120
120
!!
120
Merge branch 'master' of https://github.com/momoplan/petandroid1.git

Conflicts:
	src/petcircle/yl/ui/RegisterOneActivity.java