cambios
Merge branch 'master' of https://github.com/camarc/full10

Conflicts:
	.idea/workspace.xml