merging
Merge remote-tracking branch 'origin/merge' into modelcontroller

Conflicts:
	src/command/CommandPreParser.java