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

Conflicts:
	.gitignore
	ticket-tour-jx/trunk/.classpath
Merge branch 'master' of https://github.com/komelio/ticket_all