Iteration 3 for Decoration Train
Merge branch 'create-proof' into develop

Conflicts:
	db/schema.rb
	spec/models/job_spec.rb
Iteration 3 for Decoration Train
Merge branch 'develop' of https://github.com/AnnArborTees/softwear-crm into develop

Conflicts:
	app/assets/javascripts/artwork_requests.js.coffee
Merge branch 'develop' of https://github.com/AnnArborTees/softwear-crm into develop

Conflicts:
	app/assets/javascripts/artwork_requests.js.coffee