Corregí vistas mal elaboradas
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