Merge pull request #1 from imarban/master

Agregue vista de Iniciar Sesion
\\Ö//

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
Fix ignored files.
Fix merge issue with zukita version in string.xml
No podía hacer launch de la aplicación
Test consultando servicios
- Se creó una la Clase Kind que representa los tipos de mascotas
- Se creó JsonAdapter para convertir un objeto json a la clase especificada (marca error al asignar el valor del field)
- Se agregó permiso de acceso a internet para consultar servicios
- Se creó código en EditPetActivity para consultar el servicio
Agregue Vistas RateMyPet y PetMatch
Edité conflictos generados al intentar hacer Merge con Original
Edité conflictos generados al intentar hacer Merge con Original
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/Pawhub_PetMatch.apk
	bin/classes.dex
	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/classes/com/blastic/pawhub_petmatch/RateMyPetActivity.class
	bin/resources.ap_
	gen/com/blastic/pawhub_petmatch/R.java
	res/layout/activity_login.xml
	res/layout/activity_rate_my_pet.xml
	res/values/strings.xml