游泳池试用版(中山,到2014-01-10)
Merge branch 'master' of https://github.com/komelio/ticket_all

Conflicts:
	ticket-client/tags/ticket-exe-jx(win32)/瀹夎鑴氭湰.iss
ticket
中山游泳馆项目-从厦门项目改编过来