Intergration of timeline editing and main app
Adding fireworks by buttons
Minor mods to the JS
Merge branch 'jack' into develop

Conflicts:
	app/assets/javascripts/tracks.js.coffee
	app/controllers/shows_controller.rb
	app/views/shows/edit.html.erb
	db/schema.rb
	vendor/assets/stylesheets/timeline.css
Merged with some bug fixes. Semi-working
progress bars do cool stuff like change color and disappear
controls appear when song downloads as well as when drag and drop
bug fixes mainly on timeline
Fixed the snap to seconds bug.
Merge branch 'jack' into develop

Conflicts:
	app/views/shows/edit.html.erb