Iteration 2 for Decoration Train (Artwork Requests can be responded to with Artwork), as well as fixing bug #221, bug #222 and adding asset specs
Merge branch 'create-artwork' into develop

Conflicts:
	config/routes.rb
	spec/controllers/artwork_requests_controller_spec.rb
	spec/views/artwork_requests/_artwork_request.html.erb_spec.rb
Iteration 2 for Decoration Train (Artwork Requests can be responded to with Artwork), as well as fixing bug #221, bug #222 and adding asset specs
Merge branch 'develop' of https://github.com/AnnArborTees/softwear-crm into develop-david