Merge pull request #1 from beego/master

Merge from beego we talk