Added type property to entities for identification in combat.
Added attack types property to CanFight component, allowing entities to be configured to attack specific entities.
Merge branch 'dev' of https://github.com/ruscoe/dungeongeneration into ruscoe-dev

Conflicts:
	lib/factories/decorationfactory.js
	lib/factories/enemyfactory.js
	lib/factories/playerfactory.js
	lib/factories/propfactory.js
	lib/gameobjects/entity.js
Merge branch 'ruscoe-dev' into dev