About to do a scary merge
Merge branch 'shoppingCart2' into dev3