Merge origin/master

Conflicts:
	build/built-jar.properties
	build/classes/demoui/MainUI.class
	build/classes/demoui/SalesMainUI.class