\\Ö//

activity main, editpet, matchsettingd y rate my pet
Merge branch 'master' of https://github.com/asukita/Pawhub_PetMatch

Conflicts:
	bin/classes.dex
	bin/classes/com/blastic/pawhub_petmatch/LoginActivity.class
	bin/classes/com/blastic/pawhub_petmatch/MainActivity.class
	bin/classes/com/blastic/pawhub_petmatch/R$drawable.class
	bin/classes/com/blastic/pawhub_petmatch/R$id.class
	bin/classes/com/blastic/pawhub_petmatch/R$layout.class
	bin/classes/com/blastic/pawhub_petmatch/R$menu.class
	bin/classes/com/blastic/pawhub_petmatch/R$string.class
	bin/classes/com/blastic/pawhub_petmatch/R$style.class
	bin/resources.ap_
	gen/com/blastic/pawhub_petmatch/R.java
	res/drawable-mdpi/gradient.xml
	res/layout/activity_login.xml
	res/values/strings.xml
	src/com/blastic/pawhub_petmatch/LoginActivity.java