update 25.10.2014 p1
Merge remote-tracking branch 'origin/master'

Conflicts:
	directhrm/src/directhrm/gui/windows/MainWindow.form
	directhrm/src/directhrm/gui/windows/MainWindow.java
Merge remote-tracking branch 'origin/master'
Main window modified