nn
nn
nn
nn
nn
nn
nn
nn
nn
nn
nn
merge from head
new setting
solve conflict
Merge remote-tracking branch 'origin/master'

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