Some modifications
Merge branch 'master' of https://github.com/TriComp/TriComp

Conflicts:
	interface/editor.cpp