Added attack stuff (not verified to work yet), also fixed the rogue session in dev mode
Merge branch 'master' into fela_js
Basic attacking framework completed (with a few bugs)
Merge branch 'master' into fela_js

Conflicts:
	js/modules/units.js
added markerlabel.js
Merge pull request #59 from felamaslen/fela_js

Basic attacking framework done