More cleanup
That was a small fix
Merge branch 'master' into file-uploader

* master:
  That was a small fix
  More cleanup

Conflicts:
	app/controllers/rasterizer_controller.rb