Added Squashed of commits with one task

This reverts commit bdbeabd5d08a8e60b945158884318e3a02791565.

Conflicts:
	app/controllers/refinery/reports_controller.rb