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

Conflicts:
	project.properties
	res/values/strings.xml
	src/com/hackaton/thegublys/MainActivity.java
errores merge corregidos
commit alpha
commit alpha
merge1
fuck R
compliance level 1.6
Merge https://github.com/jvcerver/TheGublys