sma EM
Merge branch 'master' of https://github.com/bjornlogi/Bomberman

Conflicts:
	entityManager.js