Merge branch 'release/1.1' into develop
add featured_in_category boolean field
bump version numbers
Merge branch 'release/1.2.0'
Merge branch 'master' of github.com:praekelt/unicore-gitmodels