e
Merge branch 'master' of https://github.com/PatrykGala/Modbus.git

Conflicts:
	Modbus/src/atrem/modbus/swing/ConnectionSetupDialog.java