Merge pull request #5 from ongoworks/devel

Updated cart, various UI fixes
Merge branch 'devel'
Add sub shops to shopAdminController
Merge branch 'master' into devel