Merge branch 'dev'
create SearchEmployeeUI
Merge branch 'dev'
Merge branch 'featureSearchEmployeeUI' into dev
Merge branch 'master' of ssh://git@github.com/mistkafka/Hehehehehehe.git
Merge branch 'master' of ssh://git@github.com/mistkafka/Hehehehehehe.git
into dev

Conflicts:
	src/com/team005/empmis/ui/UIFactory.java
	src/com/team005/empmis/ui/UIType.java