Move unfortunately named legacy assets/ folder to attachments/
Merge branch 'master' into rails-4.2

Conflicts:
	app/models/image.rb
	app/models/media.rb
	app/models/track.rb
	lib/attached_image.rb