corrections
corrections
Merge pull request #1 from larryzhao/master

README corrections
语法小问题fix

个人认为，描述简洁清爽的dashboard的话，concise比clear要更合适一些
Merge pull request #2 from dotcom900825/patch-1

语法小问题fix
remove unuse routes.
Update INSTALL-ubuntu.md sub header
Add config/nginx.conf.example
Update INSTALL-ubuntu.md

ImageMagick is required by the mini_magick gem.
Update rails to 4.0.2 and bcrypt-ruby to 3.1.2
Merge pull request #10 from dorentus/patch-1

更新 INSTALL-ubuntu.md，添加安装 imagemagick
Update README.md
set httponly to remember_me's cookie
Merge pull request #13 from shouxian/master

set httponly to remember_me's cookie
Merge pull request #1 from chloerei/master

同步代码