Finish all the Server part
Merge branch 'master' of https://github.com/superhell/HR-Management

Conflicts:
	HR Application/nbproject/project.properties
	HRApp/HRApp-ejb/build/classes/DataSetUp/dataSetUp.class
	HRApp/HRApp-ejb/dist/HRApp-ejb.jar
	HRApp/HRApp-ejb/src/java/DataSetUp/dataSetUp.java
	HRApp/build/HRApp-ejb.jar
	HRApp/dist/gfdeploy/HRApp/HRApp-ejb_jar/DataSetUp/dataSetUp.class