CR1.01
CR1.02
CR1.03
Merge branch 'develop' into release-1.0
CD6
CD7
CR1.04
CR1.05
Merge branch 'release-1.0' into develop

Conflicts:
	src/egit/Clase3.java