Battle service
Merge + fix

Conflicts:
	app/js/controllers/play.controller.js
	app/js/directives/arena.directive.js
Merge branch 'master' of github.com:buddhabrot/hacktheelections

Conflicts:
	app/css/main.css