To merge from github
Merge branch 'master' of https://github.com/Ckef/CWorxEngine

Conflicts:
	include/CWorxEnginePrerequisites.h
Added prerequisites locally