add  customer review
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/admin/devise/passwords_controller.rb