Merge branch 'master' of https://github.com/mortaldraw/IceCreamSandwichAndroid

Conflicts:
	src/activities/Resultado.java