AdminManager updated
update 2.12.2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	directhrm/src/directhrm/db/DbAdminManager.java
	directhrm/src/directhrm/gui/windows/MainWindow.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	directhrm/src/directhrm/entity/Admin.java
	directhrm/src/directhrm/gui/controller/ControllerPerson.java
update 7.12.2014