20141209
Merge branch 'master' of github.com:cc001116/tick-master
xiugai
Merge branch 'master' of github.com:cc001116/tick-master