Merge remote-tracking branch 'origin/DavidBranch' into MaxBranch

Conflicts:
	src/rts/core/engine/Engine.java
	src/rts/views/CreateView.java