input and color updates
updated extended warranties view, updated colors
fix pesky display bug
merge conflict fixes
Merge branch 'master' into css

Conflicts:
	app/components/product-search-results.js
	app/pages/product-search.js
	app/pages/warranties.js
Merge branch 'css'
fixes
minor css change