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

Conflicts:
	src/petcircle/activity/login/LoginActivity.java
Merge branch 'master' of github.com:momoplan/petandroid1
Merge branch 'master' of github.com:momoplan/petandroid1
Merge branch 'master' of github.com:momoplan/petandroid1
Merge branch 'master' of github.com:momoplan/petandroid1
Merge branch 'master' of github.com:momoplan/petandroid1
modify
Merge branch 'master' of github.com:momoplan/petandroid1