修小細節
Merge branch 'release0608'
Merge branch 'master' of github.com:evendesign/4am.tw.source