Alot of editor
Merge branch 'master' of github.com:opatut/arachnonoia

Conflicts:
	src/EditorState.hpp
	src/State.cpp
	src/State.hpp
Merge branch 'master' of github.com:opatut/arachnonoia

Conflicts:
	src/Entity.hpp
	src/State.cpp