e
Merge branch 'master' of https://github.com/komelio/ticket_all

Conflicts:
	ticket-dalian/trunk/src/main/java/com/sweii/service/impl/CommonServiceImpl.java
	ticket-school/trunk/src/main/java/com/tendcent/server/ServerHandler.java
	ticket-school/trunk/ticket_school.20130829-021945.update.sql