moved timers into controller scope
correctly stopping timer
begin work on spinner (Right hand side)
Merge branch 'bugfix' into bugfixMerge

Conflicts:
	public/scripts/controllers/game.js
Reverted spinner back to normal