Added address to shopuser
Merge remote-tracking branch 'origin/fraenzi-branch' into simon-branch
Removed var_dump (was only for debugging)
Refactored ShopUser
Added attributes to detail view and ER model
Completed ER model and updated SQL. Also modified ShoppingCart
Added "other" product type into ER model
Fixed product_type for multiple products, fixed non-visible attributes
Fixed get_translation() so it does not blow up on multiple commas
Hack: Removed shoppingcart.php to fix some branch-specific issues
Hack: Re-added shoppingcart.php to fix branch-specific issues
Do not ask me where this file comes from...
Merge remote-tracking branch 'origin/simon-branch'

Conflicts:
	Webshop/webroot/shoppingcart.php
Merge remote-tracking branch 'origin/master' into simon-branch
changed order form to use language files.