En proceso de modo invitación funcional
Merge https://github.com/jvcerver/TheGublys

Conflicts:
	project.properties
	res/values/strings.xml
	src/com/hackaton/thegublys/MainActivity.java
commit alpha
commit alpha
merge1