Merge origin/master

Conflicts:
	src/view/WidgetOrder.java
Merge origin/master
Merge origin/master

Conflicts:
	src/view/WidgetOrder.java
Merge origin/master
Merge origin/master

Conflicts:
	src/view/WidgetOrder.java
Merge origin/master

Conflicts:
	src/view/WidgetOrder.java
Merge origin/master

Conflicts:
	src/view/WidgetOrder.java
Merge origin/master

Conflicts:
	src/view/WidgetOrder.java
Merge origin/master

Conflicts:
	src/model/CustomerOrder.java
	src/model/EntityList.java
	src/model/Widget.java
	src/view/StoreManager.java
	src/view/WidgetOrder.java
Merge origin/master

Conflicts:
	src/model/CustomerOrder.java