Caught up to Beego 1.2.0
Merge pull request #9 from astaxie/develop

Caught up to Beego 1.2.0