Entity grid
Merge branch 'trigram' of github.com:kedz/discourse into trigram