Merge origin/master

Conflicts:
	CG-PL001/src/Logic/PersistenceManager.java
	CG-PL001/src/Logic/Simulator.java
Merge origin/master