edit map in battle
tank debug
Merge remote-tracking branch 'origin/master' into pilot
Merge remote-tracking branch 'origin/dcsan' into pilot
reset route
Merge branch 'dcsan'
Merge remote-tracking branch 'origin/master' into pilot

Conflicts:
	app/both/collections/Battles.coffee
fix tanks leaving room
better room exit
big buttons
starting mapItem
Merge remote-tracking branch 'origin/master' into pilot

Conflicts:
	app/both/routes.coffee
rmoved bullets.coffe