version 20131128 16:15 scutLaoYi

完成所有注释操作，merge院长的fix bug版本后作为最终版本发布
Merge branch 'master' of https://github.com/scutLaoYi/blog
version 20131128 16:45 scutLaoYi

Almost complete!
Just waiting for acbron to change a little css setting for about_us.ctp