Merge remote-tracking branch 'allen/master'

Conflicts:
	.myhibernatedata
	.settings/org.eclipse.core.resources.prefs
	WebRoot/index.jsp
	WebRoot/js/personView.js
	WebRoot/reserve.jsp
	hibernate.reveng.xml
	src/com/airticket/adapter/DataReceiver.java
	src/com/airticket/bean/BeingOrder.java
	src/com/airticket/bean/HistoryOrder.java
	src/com/airticket/bean/Order.java
	src/com/airticket/bean/OrderId.java
	src/com/airticket/bean/OrderRecord.java
	src/com/airticket/bean/UntreatedOrder.java
	src/com/airticket/biz/impl/OrderBizImpl.java
	src/com/airticket/biz/impl/OrderPassengerBizImpl.java
	src/com/airticket/dao/OrderIdDao.java
	src/com/airticket/dao/impl/OrderIdDaoImpl.java
	src/com/airticket/dao/impl/OrderRecordDaoImpl.java
	src/com/airticket/listener/DataConfigLoaderListener.java
	src/com/airticket/web/action/OrderAction.java
	src/com/airticket/web/interceptor/SaveOrderInterceptor.java
	src/com/airticket/web/interceptor/SaveReserveInterceptor.java
	src/spring.xml
	src/struts.xml
Merge remote-tracking branch 'allen/master'

Conflicts:
	.myhibernatedata
	.settings/org.eclipse.core.resources.prefs
	WebRoot/index.jsp
	WebRoot/js/personView.js
	WebRoot/reserve.jsp
	hibernate.reveng.xml
	src/com/airticket/adapter/DataReceiver.java
	src/com/airticket/bean/BeingOrder.java
	src/com/airticket/bean/HistoryOrder.java
	src/com/airticket/bean/Order.java
	src/com/airticket/bean/OrderId.java
	src/com/airticket/bean/OrderRecord.java
	src/com/airticket/bean/UntreatedOrder.java
	src/com/airticket/biz/impl/OrderBizImpl.java
	src/com/airticket/biz/impl/OrderPassengerBizImpl.java
	src/com/airticket/dao/OrderIdDao.java
	src/com/airticket/dao/impl/OrderIdDaoImpl.java
	src/com/airticket/dao/impl/OrderRecordDaoImpl.java
	src/com/airticket/listener/DataConfigLoaderListener.java
	src/com/airticket/web/action/OrderAction.java
	src/com/airticket/web/interceptor/SaveOrderInterceptor.java
	src/com/airticket/web/interceptor/SaveReserveInterceptor.java
	src/spring.xml
	src/struts.xml
Merge branch 'master' of https://github.com/budonglaoshi/airticket.git