Cambios en el .project de eclipse
Merge branch 'develop'

Conflicts:
	.project