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

Conflicts:
	Modbus/.classpath
	Modbus/.settings/org.eclipse.jdt.core.prefs