Refactored
Merge branch 'origin/andreas'
sum of work days and holidays must not be > 5
Merge branch 'origin/bobby'
Merge branch 'master' into andreas

Conflicts:
	ts14/test/cs/rsa/ts14/bravo/TestClassifier.java