merge
Mmergeerge branch 'master' of https://github.com/zluo/gs

Conflicts:
	gs-core/src/main/groovy/com/zluo/gs/service/TickerService.groovy