fix
Merge branch 'master' of github.com:jingen/linjingen.com
Merge branch 'master' of github.com:jingen/linjingen.com
Merge branch 'master' of github.com:jingen/linjingen.com
Merge branch 'master' of github.com:jingen/linjingen.com
Merge branch 'master' of github.com:jingen/linjingen.com
Merge branch 'master' of github.com:jingen/linjingen.com
Merge branch 'master' of github.com:jingen/linjingen.com
production