tmp :-)
Merge branch 'tcp' of https://github.com/tkessels/publicMain.git into
tcp

Conflicts:
	publicMAIN/src/org/publicmain/common/Config.java
	publicMAIN/src/org/publicmain/sql/BackupDBConnection.java