Change codeship.io badge to use master branch
Merge branch 'master' into update-for-beego-filtering