logging
adding term chars
Merge branch 'master' of https://github.com/simonlennon/Automate.git

Conflicts:
	src/main/java/com/simonlennon/automate/pond/PondController.java
	src/main/java/com/simonlennon/automate/serialcomms/MastercontSerialInterface.java