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
Refactored shoppingCart.php to shoppingcart.php
Merge remote-tracking branch 'origin/fraenzi-branch' into simon-branch
Removed case-sensitivity from site names
Modified login session variables, implemented ShopUser
Added first version of admin interface (admin.php)
Added "Admin" link to the sidebar
beautified shopping cart
fixed display shoppingCart functions
implemented display shoppincCart small function for sidebar
Added form to add and edit items
Added admin_add() function to admin panel
Added admin_delete() and admin_update() functions to admin panel
changes in orderForm non working
changed js back
Merge remote-tracking branch 'origin/fraenzi-branch' into simon-branch
Fixed JavaScript functions (regex and error messages)
Updated TODO