Started reports ActiveModel
Added quote source to quote, story 51
Merge branch 'story-122-nick' into release-2014-10-03
Merge branch 'story-86-david' of https://github.com/AnnArborTees/softwear-crm into release-2014-10-17

Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb
Merge
Imprintables have upcharge information associated with them
Merge branch 'release-2014-10-17' of https://github.com/AnnArborTees/softwear-crm into story-185-david

Conflicts:
	db/schema.rb