prueba
Merge branch 'master' of https://github.com/GEORBIS/adenunciar

Conflicts:
	adenunciar/res/values/strings.xml