Javadoc
Merge remote-tracking branch 'bitHub/master'

Conflicts:
	timesheet/src/main/java/de/bit/model/Event.java