数据库脚本改动.
Merge branch 'master' of https://github.com/komelio/ticket_all
Merge branch 'master' of https://github.com/komelio/ticket_all

Conflicts:
	ticket-ski/trunk/ticket_ski.20131108-221626.full.sql