no message
Merge branch 'master' of https://github.com/asukita/Pawhub_PetMatch

Conflicts:
	bin/classes/com/blastic/pawhub_petmatch/EditUserActivity.class
	bin/classes/com/blastic/pawhub_petmatch/GlobalRatesActivity.class
	gen/com/blastic/pawhub_petmatch/R.java
	src/com/blastic/pawhub_petmatch/EditPetActivity.java