Beginning work for artwork requests
Commit to get up to date with develop since behind
Commit to get up to date with develop since behind
Merge branch 'develop' into artwork-request

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	config/routes.rb
	db/schema.rb
	db/seeds.rb
Commit to get up to date with develop since behind
Committing to push onto develop-nick for Ricky to look over this weekend
Committing artwork request, all but edit finished
Committing artwork request
Commit artwork_request
Merge branch 'artwork-request' into develop

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/orders.js.coffee
	app/assets/javascripts/user_lock.js.coffee
	app/assets/stylesheets/application.css
	config/routes.rb
	db/schema.rb
	db/seeds.rb
	spec/models/job_spec.rb