Merge branch 'master' of https://github.com/davidlcamlin/totus_modbus

Conflicts:
	Totus_jamod/build/classes/totus_jamod/Totus_jamod.class
	Totus_jamod/src/totus_jamod/Totus_jamod.java
Merge branch 'master' of https://github.com/davidlcamlin/totus_modbus

Conflicts:
	Totus_jamod/build/classes/totus_jamod/Totus_jamod.class
	Totus_jamod/src/totus_jamod/Totus_jamod.java