Rendering process
Merge
Merge branch 'master' of https://github.com/3print/btlec

Conflicts:
	config/initializers/carrierwave.rb