Merge branch 'master' of github.com:OpenMW/openmw into nif_changes

Conflicts:
	components/nif/niffile.hpp
Updated:
        components/nif/test/niftest.cpp