Merged latest development branch from beego and added AppEngine tweaks