sync

sync
sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	target/classes/beans.xml
	target/classes/com/bps/entity/OrderEntity.class
	target/classes/hibernate.cfg.xml
	target/classes/messages.properties
	target/classes/struts.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	target/classes/beans.xml
	target/classes/com/bps/entity/OrderEntity.class
	target/classes/hibernate.cfg.xml
	target/classes/messages.properties
	target/classes/struts-customer.xml
	target/classes/struts.xml