added functional tests for product controller
Merge branch 'master' into step_7

Conflicts:
	app/controllers/products_controller.rb