Merge pull request #2 from caherfe/master

COGIENDO LAYOUT
Quick Start funcional y toast login
layout terminados
Merge pull request #4 from esbrena/master

Merge Esther
Merge https://github.com/caherfe/thegublys

Conflicts:
	project.properties
	res/values/strings.xml
	src/com/hackaton/thegublys/MainActivity.java
errores merge corregidos