Merging
Merge branch 'develop' into develop-nick
Fixed bug #176, imprintable_variant_count with jobs with no line items
Removed wip from spec
Merge branch 'develop-nick' into develop

Conflicts:
	db/schema.rb