changes for department and login
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/bean/Department.java