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

Conflicts:
	src/petcircle/yl/ui/MainActivity.java
nn
Merge branch 'master' of git@github.com:momoplan/petandroid1.git
nn
nn
nn
nn