Merge pull request #1 from thaodtp/master

â
Merge pull request #2 from thaodtp/master

aaa
Merge pull request #3 from thaodtp/master

aaa
Merge pull request #4 from thaodtp/master

a
Merge origin/master
Merge pull request #6 from a05169/master

fjyj
Merge origin/master

Conflicts:
	src/java/biz/DepartmentManager.java
	src/java/da/DepartmentJpaController.java
	src/java/ui/DepartmentUI.java