Merge pull request #475 from youyong205/master

refactor
refactor app code
modify double format
refactor
Merge pull request #477 from youyong205/master

refactor code
resolve conflicts
delete log
Merge pull request #476 from jialinsun/master

refactor app code
Merge branch 'master' of github.com:dianping/cat