Cambios a TextInputs

Se les añade placeholder
Merge branch 'master' of https://github.com/salvadormaurilio/Guarurapp

Conflicts:
	gen/com/leyendalabs/guarurapp/R.java
	project.properties