- rails version bump
Merge branch 'master' of github.com:PlaySwell/swell_media
Merge branch 'master' of github.com:PlaySwell/swell_media

Conflicts:
	Gemfile.lock