Merge branch 'angular' of git://github.com/dshurt/Open-Storefront into angular