config
Merge origin/master

Conflicts:
	ES09-MerLION-war/nbproject/build-impl.xml
	ES09-MerLION-war/nbproject/genfiles.properties
	ES09-MerLION-war/nbproject/project.properties
	ES09-MerLION-war/nbproject/project.xml
contactUs
main
signUp
Merge origin/master

Conflicts:
	ES09-MerLION-war/nbproject/build-impl.xml
	ES09-MerLION-war/nbproject/genfiles.properties
	ES09-MerLION-war/nbproject/project.properties
	ES09-MerLION-war/nbproject/project.xml
         contactUs
          main
          signUp
Merge origin/master

Conflicts:
	ES09-MerLION-war/nbproject/build-impl.xml
	ES09-MerLION-war/nbproject/genfiles.properties
	ES09-MerLION-war/nbproject/project.properties
	ES09-MerLION-war/nbproject/project.xml
	nbproject/project.properties
Merge origin/master

Conflicts:
	ES09-MerLION-ejb/nbproject/project.properties
entity updated
Merge origin/master

Conflicts:
	ES09-MerLION-ejb/src/java/merlion/ejb/AccountSessionBean.java
	nbproject/project.properties