some great changes :)

Conflicts:
	GameMakerEditor/src/gui/EditorFrame.java