Working on playing/pausing watches
Added normal watch
Merge branch 'refs/heads/feature/pause_hidden' into watch/normal

Conflicts:
	.coffeescript-cache/__sers_mattjohnston__ites__atches_dev__rist_coffeescripts_application_coffee
	fire_app_log.txt
Got the play/pause visible working