Refactor nav helper and specs
Merge branch 'style-project' of https://github.com/AnnArborTees/softwear-crm into style-project-david

Conflicts:
	app/controllers/artwork_requests_controller.rb
	app/controllers/artworks_controller.rb
	app/controllers/imprint_methods_controller.rb