Formatting code to be consistent on the project
Merge branch 'master' of github.com:LauriM/ProjectIce

Conflicts:
	src/engine/world/WorldSystem.cpp