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

Conflicts:
	src/petcircle/activity/update/UpdateNicNameActivity.java
Merge branch 'master' of github.com:momoplan/petandroid1