Engine uses Entity internally to store its components
Merge branch 'master' of https://github.com/phosphoer/TankJS

Conflicts:
	js/Engine.js