Commit4 develop
Commit5 develop
Merge branch 'develop' into release-1.0

Conflicts:
	src/egit/ClaseA.java