se agrega style v14 y v11

lalalalalalala
se agregaron vistas varias
Merge branch 'master' of https://github.com/JuliusCesarius/Pawhub_PetMatch

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/R.txt
	bin/classes.dex
	bin/classes/com/blastic/pawhub_petmatch/EditPetActivity.class
	bin/classes/com/blastic/pawhub_petmatch/LoginActivity.class
	bin/classes/com/blastic/pawhub_petmatch/MainActivity.class
	bin/classes/com/blastic/pawhub_petmatch/MatchSettingsActivity.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/classes/com/blastic/pawhub_petmatch/R$styleable.class
	bin/classes/com/blastic/pawhub_petmatch/RateMyPetActivity.class
	bin/dexedLibs/gridlayout_v7-8066e225e07c69741c31af5ffccc514a.jar
	bin/pawhub_petmatch.apk
	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
	src/com/blastic/pawhub_petmatch/EditPetActivity.java
	src/com/blastic/pawhub_petmatch/MainActivity.java
Merge pull request #4 from asukita/master

Merge de últimos cambios de Azukita
Creación de Clase genérica para obtener queries a servicios mediante AsyncTasks [Aún marca error]
Fix de GetTypedTast y JsonAdapter
no message
Modificaciones del de los Adapters Genéricos para manejo de peticiones json
Merge branch 'master' of https://github.com/imarban/Pawhub_PetMatch

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	res/layout/activity_main.xml
	res/values/strings.xml
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
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
Creación de Clases para objetos json provenientes de los servicios
Creación de Adapter para llenar Spinner de Kinds