Merge origin/master

Conflicts:
	SD1314pl001/src/client/Mensage.java
Merge origin/master

Conflicts:
	SD1314pl001/src/client/Mensage.java
Merge origin/master

Conflicts:
	SD1314pl001/src/client/Mensage.java
Merge origin/master

Conflicts:
	CG-PL001/dist-linux-amd64/CG-PL001.jar
	CG-PL001/dist-linux-i586/CG-PL001.jar
	CG-PL001/dist-macosx-ppc/CG-PL001.jar
	CG-PL001/dist-macosx-universal/CG-PL001.jar
	CG-PL001/dist-solaris-i586/CG-PL001.jar
	CG-PL001/dist-solaris-sparc/CG-PL001.jar
	CG-PL001/dist-solaris-sparcv9/CG-PL001.jar
	CG-PL001/dist-windows-amd64/CG-PL001.jar
	CG-PL001/dist-windows-i586/CG-PL001.jar
	CG-PL001/src/CGPL/CGPL001.java
	CG-PL001/src/Logic/PersistenceManager.java
	CG-PL001/src/Logic/Section.java
	CG-PL001/src/Logic/Simulator.java
	CG-PL001/src/Logic/Source.java
Merge origin/master

Conflicts:
	CG-PL001/dist-linux-amd64/CG-PL001.jar
	CG-PL001/dist-linux-i586/CG-PL001.jar
	CG-PL001/dist-macosx-ppc/CG-PL001.jar
	CG-PL001/dist-macosx-universal/CG-PL001.jar
	CG-PL001/dist-solaris-i586/CG-PL001.jar
	CG-PL001/dist-solaris-sparc/CG-PL001.jar
	CG-PL001/dist-solaris-sparcv9/CG-PL001.jar
	CG-PL001/dist-windows-amd64/CG-PL001.jar
	CG-PL001/dist-windows-i586/CG-PL001.jar
	CG-PL001/src/CGPL/CGPL001.java
	CG-PL001/src/Logic/PersistenceManager.java
	CG-PL001/src/Logic/Section.java
	CG-PL001/src/Logic/Simulator.java
	CG-PL001/src/Logic/Source.java