Merge origin/master

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