Pricing iteration 1 + specs
Merge branch 'develop' of https://github.com/AnnArborTees/softwear-crm into develop-david

Conflicts:
	app/views/imprintables/_basic_info.html.erb
	config/routes.rb
	db/seeds.rb