paar problems minder...
Merge branch 'master' of https://github.com/GillDeSmedt/D-G

Conflicts:
	OrderCafe/OrderCafe/App_Code/model.dbml.layout
	OrderCafe/OrderCafe/App_Code/model.designer.vb
	OrderCafe/OrderCafe/Web.config