Bug fixes
Merge branch 'master' of https://github.com/crawley/CMM-data-grabber

Conflicts:
	paul/src/test/java/au/edu/uq/cmm/paul/grabber/GrabberEventTest.java