fixing things
first iteration of imprintable variants
Merge branch 'develop' of https://github.com/AnnArborTees/softwear-crm into develop-david

Conflicts:
	config/routes.rb
Slight refactor

Tag appropriate specs as color_spec, imprintable_variant_spec,
imprintable_spec, size_spec, style_spec, brand_spec
Add Brand drop down to style form

Style Model:
  Scope uniqueness of name and catalog_no onto brand_id
Size:
  Validate sku is 2 char long
  Validate uniqueness of sort order
Style, Brand: Validate sku is 2 char long
Color: Validate sku is 3 char long
Imprintable: shorten find_variants
Restyle model organization
Second iteration on imprintable and variants

Add shorthand method in imprintable variant to return style and brand
Add human_boolean method to application helper
Add button to variants grid to display the select drop down
Change sizes in the variants grid to use display value instead of name
Only use modal errors in views
Edit nav_helper to accept a boolean 'active' rather than a string
Refactor models using Paranoia

Validate sizing category for imprintable
Create sizing category field for imprintable
Extend test suite
Merge branch 'develop' of https://github.com/AnnArborTees/softwear-crm into develop-david

Conflicts:
	app/helpers/application_helper.rb
	app/views/shared/_sidebar_menu.html.erb
	db/schema.rb