Merge pull request #1 from admpub/patch-1

合并
Merge pull request #3 from admpub/patch-1

更新到最新版
Merge pull request #4 from lunny/master

更新到最新版
美化错误页面模板和增加对自定义错误页面模板的支持

Signed-off-by: 商讯在线 <swhbox@foxmail.com>
Merge pull request #7 from admpub/master

Master