Fixed event enemy to not trigger when it finds you on the field
Merge branch 'master' of https://github.com/fast4y/Ninjaes

Conflicts:
	public/app/map/MapCtrl.js