adapted table for shoppingCart (unfinished)
Merge remote-tracking branch 'origin/master' into fraenzi-branch

Conflicts:
	Webshop/webroot/modules/classes/ShoppingCart.php
Removed breaks (SSH key test)
Another SSH key test
- updated ToDo
- changed shoppingCart functions
Merge remote-tracking branch 'origin/fraenzi-branch' into simon-branch