IMPORTANT: SORRY I accidentally introduced an extra comma to adding shopping cart items and that broke it. I have removed the comma.
Merge branch 'master' into awesomesauce
FIXED BUG WITH LOGGING IN AFTER REGISTRATION