local update
update
added machineresponse, organizing
Merge branch 'master' of https://github.com/ergobot/ResinPrinterDemo.git

Conflicts:
	ResinPrinterHost/resources/config.properties
	ResinPrinterHost/src/net/resinprinter/host/MachineResource.java
	ResinPrinterHost/src/net/resinprinter/host/Main.java