before update
Merge branch 'master' of github.com:unicorny/DREngine

Conflicts:
	dependencies/Core2/include/DRVector3.h
	dependencies/include/Core2/DRVector3.h
	import/include/Core2/DRVector3.h
	import/include/Engine2Main.h
	include/Engine2Main.h
	src/CMakeLists.txt
removed merging errors