修正一些小问题

Signed-off-by: Meathill <meathill@gmail.com>
Merge branch 'master' of github.com:Dianjoy/site2013