simple enemy patrol
Merge branch 'master' of https://github.com/proog/mgae-e2014

Conflicts:
	js/actorstates.js
	js/app.js
	js/states.js