many changes from Kin
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/editor/gui/SelectedTileTypePanel.java
	src/editor/gui/ToolboxPanel.java
	src/editor/gui/WorkingAreaPanel.java
	src/editor/model/ModelManager.java
	src/editor/model/UpdateTileAtCommand.java
Merge remote-tracking branch 'origin/master'