.

.
.

.
modified newClient.jsp
setup hibernate
modify add account
rebuild branch
modified database
update Database
Merge branch 'add_account' of https://github.com/Gary-fyp/fyp into add_account

Conflicts:
	build/web/WEB-INF/classes/bizcentre/bean/AddressChoiceDetail.class
	build/web/WEB-INF/classes/bizcentre/bean/AddressChoiceDetail.hbm.xml
	build/web/WEB-INF/classes/bizcentre/bean/CallHandlingDetail.class
	build/web/WEB-INF/classes/bizcentre/bean/CallHandlingDetail.hbm.xml
	build/web/WEB-INF/classes/bizcentre/bean/Client.class
	build/web/WEB-INF/classes/bizcentre/bean/Client.hbm.xml
	build/web/WEB-INF/classes/bizcentre/bean/ClientCompany.hbm.xml
	build/web/WEB-INF/classes/bizcentre/bean/ClientCompanyId.class
	build/web/WEB-INF/classes/bizcentre/bean/Company.class
	build/web/WEB-INF/classes/bizcentre/bean/Company.hbm.xml
	build/web/WEB-INF/classes/bizcentre/bean/FaxServiceDetail.class
	build/web/WEB-INF/classes/bizcentre/bean/FaxServiceDetail.hbm.xml
	build/web/WEB-INF/classes/bizcentre/bean/GraphDesignDetail.class
	build/web/WEB-INF/classes/bizcentre/bean/GraphDesignDetail.hbm.xml
	build/web/WEB-INF/classes/bizcentre/bean/MailNotificationDetail.class
	build/web/WEB-INF/classes/bizcentre/bean/MailNotificationDetail.hbm.xml
	build/web/WEB-INF/classes/bizcentre/bean/MailPackageDatail.class
	build/web/WEB-INF/classes/bizcentre/bean/MailPackageDatail.hbm.xml
	build/web/WEB-INF/classes/bizcentre/bean/OfficeRoomDetail.class
	build/web/WEB-INF/classes/bizcentre/bean/OfficeRoomDetail.hbm.xml
	build/web/WEB-INF/classes/bizcentre/bean/VirtualOfficeServicePlan.class

build/web/WEB-INF/classes/bizcentre/bean/VirtualOfficeServicePlan.hbm.xm
l
	build/web/WEB-INF/classes/bizcentre/hibernate/hibernate.cfg.xml
	build/web/WEB-INF/classes/bizcentre/hibernate/hibernate.reveng.xml
	build/web/WEB-INF/classes/bizcentre/servlet/ClientController.class
	build/web/WEB-INF/web.xml
	nbproject/private/private.xml
	src/java/bizcentre/bean/AddressChoiceDetail.hbm.xml
	src/java/bizcentre/bean/AddressChoiceDetail.java
	src/java/bizcentre/bean/CallHandlingDetail.hbm.xml
	src/java/bizcentre/bean/CallHandlingDetail.java
	src/java/bizcentre/bean/Client.hbm.xml
	src/java/bizcentre/bean/Client.java
	src/java/bizcentre/bean/ClientCompany.hbm.xml
	src/java/bizcentre/bean/ClientCompany.java
	src/java/bizcentre/bean/ClientCompanyId.java
	src/java/bizcentre/bean/Company.hbm.xml
	src/java/bizcentre/bean/Company.java
	src/java/bizcentre/bean/FaxServiceDetail.hbm.xml
	src/java/bizcentre/bean/FaxServiceDetail.java
	src/java/bizcentre/bean/GraphDesignDetail.hbm.xml
	src/java/bizcentre/bean/GraphDesignDetail.java
	src/java/bizcentre/bean/MailNotificationDetail.hbm.xml
	src/java/bizcentre/bean/MailNotificationDetail.java
	src/java/bizcentre/bean/MailPackageDatail.hbm.xml
	src/java/bizcentre/bean/MailPackageDatail.java
	src/java/bizcentre/bean/OfficeRoomDetail.hbm.xml
	src/java/bizcentre/bean/OfficeRoomDetail.java
	src/java/bizcentre/bean/VirtualOfficeServicePlan.hbm.xml
	src/java/bizcentre/bean/VirtualOfficeServicePlan.java
	src/java/bizcentre/hibernate/HibernateUtil.java
	src/java/bizcentre/hibernate/hibernate.cfg.xml
	src/java/bizcentre/hibernate/hibernate.reveng.xml
	src/java/bizcentre/servlet/ClientController.java
	web/WEB-INF/web.xml