Heat system working
Fixed buffer
Merge branch 'master' of https://github.com/PDeveloper/neuropulse.alpha

Conflicts:
	vsproject/NeuroPulse/NeuroPulse.vcxproj
	vsproject/NeuroPulse/NeuroPulse.vcxproj.filters
	vsproject/NeuroPulse/src/GameObjectFactory.cpp
Minor aftermerge fixes