初始化
Merge branch 'master' of https://git.oschina.net/komelio/ticket_all

Conflicts:
	.gitignore