...
Merge branch 'Mengdan' of https://github.com/summerz8/WeAreAce into Yoky

Conflicts:
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/nbproject/jax-ws.xml
minor changes
commit
Merge branch 'shiyu' of https://github.com/summerz8/WeAreAce into Mengdan

Conflicts:
	IslandFurnitureERPSystem/CustomerWeb/nbproject/genfiles.properties
	IslandFurnitureERPSystem/CustomerWeb/nbproject/project.properties
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/nbproject/genfiles.properties
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/nbproject/genfiles.properties
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/nbproject/project.properties
Test
merged
Merge branches 'Mengdan' and 'Yoky' of https://github.com/summerz8/WeAreAce into Mengdan

Conflicts:
	IslandFurnitureERPSystem/CustomerWeb/nbproject/genfiles.properties
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/nbproject/genfiles.properties
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/nbproject/jax-ws.xml
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/nbproject/jaxws-build.xml
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/src/java/DataSetUp/dataSetUp.java
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/src/java/ManagedBean/KM/ProcurementManagementModule/IngredientPurchaseOrderBean.java
Merge branch 'Yoky' of https://github.com/summerz8/WeAreAce into Mengdan

Conflicts:
	IslandFurnitureERPSystem/CustomerWeb/nbproject/genfiles.properties
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/nbproject/genfiles.properties
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/nbproject/jax-ws.xml
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/nbproject/jaxws-build.xml
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/src/java/DataSetUp/dataSetUp.java
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/src/java/ManagedBean/KM/ProcurementManagementModule/IngredientPurchaseOrderBean.java
no message
Merge branch 'shiyu' of https://github.com/summerz8/WeAreAce into hjq
session bean, MRP, POS changed
Merge branch 'shiyu' of https://github.com/summerz8/WeAreAce into Mengdan
Merge branch 'hjq' of https://github.com/summerz8/WeAreAce into Mengdan
final release version V1.0.0
final commit
Merge branch 'Mengdan'

Conflicts:
	.DS_Store
final final version V1.0.1
Final commit
Merge branch 'master' of https://github.com/summerz8/WeAreAce into shiyu

Conflicts:
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/src/java/.DS_Store
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/src/java/DataSetUp/dataSetUp.java