Updated to new cyborgbear.
Merge branch 'changes'

Conflicts:
	editormodels.cpp
	editormodels.hpp
	enginemodels.cpp
	enginemodels.hpp