init
init
Merge branch 'dev'
delete init
Merge branch 'master' of code.jd.com:77401941-561521/jae_thinker into dev
init jd
Merge branch 'master' of git.oschina.net:rguess/thinker into dev