Merge branch 'dialog-fix' into NonTableFields
TODO stop failing epicly with git
Merge branch 'NonTableFields' of https://github.com/sirherrbatka/openmw
into NonTableFields

I have no idea what I'm doing

Conflicts:
	apps/opencs/model/world/idtable.cpp
	apps/opencs/model/world/refidadapter.hpp
	apps/opencs/model/world/refidadapterimp.hpp