c1 to master
c2 to master
c3 to master
Merge remote-tracking branch 'origin/master' into initializationAndCleaning

Conflicts:
	trunk/InitializationAndCleaning/src/InitializationAndCleaning/InitializationAndCleaning.java