ogreConverter fixed
Merge branch 'master' of https://github.com/wangyanxing/Demi3D into GLSupporting

Conflicts:
	build/scripts/builder.py
	build/scripts/dist/builder.exe
	src/tools/OgreConverter/ConverterMgr.cpp
	src/tools/OgreConverter/DiPch.h
	src/tools/OgreConverter/ModelConverter.cpp