RR: c1
RR: c2
RR: c3
Merge branch 'release-1.0' into develop

Conflicts:
	EGIT/src/egit/ClaseA.java