Fixes the metaclass magic my last commit added.
Merge origin/develop into develop

Conflicts:
	src/ca/qc/bdeb/inf203/model/Terrain.java