Match comments ready to merge
Merge branch 'master' of https://github.com/enterthefuture/ScoutKit

Conflicts:
	src/org/scoutkit/scoutmaster/ScoutMaster.java
	src/org/scoutkit/util/ScoutDerbyHelper.java