attack with Q, some misc changes
Merge branch 'master' of https://github.com/TerranceN/ATA_Coop_Hackathon

Conflicts:
	common/entity.js