- add asset stuff to media_controller
Merge branch 'master' of github.com:PlaySwell/swell_media

Conflicts:
	app/models/swell_media/media.rb