Merge branch 'master' into UI_Improvements
Fixed shoulda matchers install
Added the reform gem
Mass Stocking work in progress
Mass Stockings form works
Merge branch 'mass_stocking'

Conflicts:
	app/views/brochure_racks/show.html.erb