Remove unnecessary (this) stuff in code.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/controllers/SimulationController.java