Resolver classpath and settings
Merge branch 'develop' of
https://github.com/rlopez0689/ECP2.Rodrigo.Lopez.git into develop

Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs