Multiple enemy,enemy object fix,enemy and shot collision
Merge branch 'master' of https://github.com/tvarbanov/RPGCanvas into tvarbanov-master

Conflicts:
	src/js/canvas/Shotfactory.js
merge conflict
Merge branch 'tvarbanov-master'