Fix to Carrierwave
Merge branch 'auth'

Conflicts:
	Gemfile.lock
Gemlock update