Pair serialization, adding objects in editor.
State switching
Merge branch 'master' of github.com:opatut/arachnonoia

Conflicts:
	src/main.cpp