Added deleting fireworks. undid the migration
Added deleting of elements. All tests green
Can add multiple events to a show
Got basic version working on edit show
added paperclip and shows have a track
Added fireworks to events.
when drag and drop song it stores file in s3 via paperclip MAGIC
Merge remote-tracking branch 'origin/jack' into dwkns

Conflicts:
	Gemfile
	app/views/shows/edit.html.erb
minor fixes
got direct upload to s3 via ajax
loads music file from database if one is already added
Intergration of timeline editing and main app
identifies the correct song for each show
Few small timeline CSS and JS changes
Tidied up shows/edit and shows controller
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