minor changes
ddd
Merge branch 'master' of https://github.com/superhell/HR-Management

Conflicts:
	HRApp/HRApp-ejb/build/classes/Entity/CheckInEntity_.class
	HRApp/HRApp-ejb/build/classes/Entity/EmployeeEntity_.class
	HRApp/HRApp-ejb/build/classes/Entity/EventEntity_.class
	HRApp/HRApp-ejb/build/classes/Entity/LeaveEntity_.class
	HRApp/HRApp-ejb/build/classes/Entity/QREntity_.class
	HRApp/HRApp-ejb/build/classes/Entity/SalaryEntity_.class
	HRApp/HRApp-ejb/build/generated-sources/ap-source-output/Entity/CheckInEntity_.java
	HRApp/HRApp-ejb/build/generated-sources/ap-source-output/Entity/EmployeeEntity_.java
	HRApp/HRApp-ejb/build/generated-sources/ap-source-output/Entity/EventEntity_.java
	HRApp/HRApp-ejb/build/generated-sources/ap-source-output/Entity/LeaveEntity_.java
	HRApp/HRApp-ejb/build/generated-sources/ap-source-output/Entity/SalaryEntity_.java
	HRApp/HRApp-ejb/dist/HRApp-ejb.jar
	HRApp/HRApp-war/dist/HRApp-war.war
	HRApp/build/HRApp-ejb.jar
	HRApp/build/HRApp-war.war
	HRApp/dist/HRApp.ear
hehe
Merge branch 'master' of https://github.com/superhell/HR-Management

Conflicts:
	HRApp/HRApp-ejb/build/classes/Entity/CheckInEntity_.class
	HRApp/HRApp-ejb/build/classes/Entity/EmployeeEntity_.class
	HRApp/HRApp-ejb/build/classes/Entity/EventEntity_.class
	HRApp/HRApp-ejb/build/classes/Entity/LeaveEntity_.class
	HRApp/HRApp-ejb/build/classes/Entity/QREntity_.class
	HRApp/HRApp-ejb/build/classes/Entity/SalaryEntity_.class
	HRApp/HRApp-ejb/build/generated-sources/ap-source-output/Entity/CheckInEntity_.java
	HRApp/HRApp-ejb/build/generated-sources/ap-source-output/Entity/EmployeeEntity_.java
	HRApp/HRApp-ejb/build/generated-sources/ap-source-output/Entity/EventEntity_.java
	HRApp/HRApp-ejb/build/generated-sources/ap-source-output/Entity/LeaveEntity_.java
	HRApp/HRApp-ejb/build/generated-sources/ap-source-output/Entity/SalaryEntity_.java
	HRApp/HRApp-ejb/dist/HRApp-ejb.jar
	HRApp/HRApp-ejb/nbproject/private/private.properties
	HRApp/HRApp-ejb/nbproject/private/private.xml
	HRApp/HRApp-war/dist/HRApp-war.war
	HRApp/build/HRApp-ejb.jar
	HRApp/dist/HRApp.ear
	HRApp/nbproject/private/private.properties
	HRApp/nbproject/private/private.xml
commit