merge
Merge branch 'master' of https://github.com/Four51/AngularJSOrder
Merge branch 'master' of https://github.com/Four51/AngularJSOrder
Merge branch 'master' of https://github.com/Four51/AngularJSOrder
SPA-10601  Repeat Order button broken
Moved the function back to orderHistoryViewCtrl where it originally was located
SPA-10614  Checkout - back button causes error after order is submitted
Redirect user to catalog page if currentOrder does not exist
Check out view changes
working on a complex selector control. saving for a later day
Merge branch 'master' of https://github.com/Four51/AngularJSOrder
a little checkout view clean up
Merge pull request #63 from olsonkr/master

SPA-10601  Repeat Order button broken AND 	SPA-10614 Checkout - back button causes error after order is submitted
SPA-10475  SPA - variant list quantity field and Add To Order button
Merge branch 'master' of https://github.com/Four51/AngularJSOrder
SPA-10624  Product/order view - variant "quantity by variant" issue
cart bottom nav for phone and tablet portrait
moved cart line count into anchor
removed device types on fixed bottom
Merge branch 'master' of https://github.com/Four51/AngularJSOrder

Conflicts:
	app/partials/checkOutView.html
Merge pull request #64 from ionlyseespots/master

added cart bottom nav for phone and tablet portrait
SPA-10496  Conditions Of Use Statement
Hide 'Conditions of Use' link if user has that permission enabled
SPA-10496  Conditions Of Use Statement
Cleaned up design of terms and conditions page
Merge branch 'master' of https://github.com/Four51/AngularJSOrder