Added allocator
Merge branch 'master' of https://github.com/stevenblaster/crapengine

Conflicts:
	source/engine/source/pluginmanager.cpp