improvements to product detail page
fix merge conflicts
fix tests
Fix merge conflicts and tests
consolidate logic for "search products"
Merge branch 'master' of https://github.com/bsnyder/sushi

# By Mike O'Donnell (2) and others
# Via Mike O'Donnell (3) and Mike Nightingale (1)
* 'master' of https://github.com/bsnyder/sushi:
  fix tests
  moved protractor so e2e runner doesn't attempt to run them
  make calls to ProductLoder consistent
  improvements to product detail page

Conflicts:
	app/js/controllers.js
Include logic consolidation
add hi-router
Merge branch 'ui-router' of https://github.com/bsnyder/sushi into ui-router

Conflicts:
	app/js/controllers.js