Adds flash messages back to layout
Merge branch 'master' into layout
Fixes all broken tests from the ADD TO CART change