Fixes after merge is done.
	modified:   apps/openmw/mwinput/inputmanagerimp.hpp
	modified:   apps/openmw/mwrender/videoplayer.cpp
	modified:   components/nifogre/ogre_nif_loader.cpp