jxi
sql
Merge branch 'master' of https://git.oschina.net/komelio/ticket_all

Conflicts:
	ticket-tour-jx/trunk/src/main/java/com/sweii/dao/BaseServiceImpl.java
	ticket-tour-jx/trunk/src/main/java/com/sweii/server/ServerHandler.java
	ticket-tour-jx/trunk/src/main/java/com/sweii/service/impl/TripServiceImpl.java
	ticket-tour-jx/trunk/src/main/java/com/sweii/vo/SaleTicket.java
	ticket-tour-jx/trunk/src/main/java/com/sweii/vo/Trip.java
	ticket-tour-jx/trunk/src/main/resources/applicationContext-dao.xml
	ticket-tour-jx/trunk/ticket_tour_jx.20130917-134401.full.sql
	ticket-tour-jx/trunk/ticket_tour_jx.20130918-060318.full.sql
	ticket-tour-jx/trunk/ticket_tour_jx.20130921-123245.full.sql