Cambio Strings
Merge branch 'master' of ssh://git@github.com/ernestone/android-apps.git

Conflicts:
	AppAdivina/res/values/strings.xml