fixed n+1 query warning
fix for #583
Merge branch 'release-lizzie' of github.com:fairnopoly/fairnopoly into release-lizzie
fix for #583
little test for #583
merge conflict
hero box
fixed a bug
Merge branch 'release-lizzie'
Merge branch 'release-lizzie' of github.com:fairnopoly/fairnopoly into release-lizzie
Merge branch 'master' into release-lizzie
Merge branch 'release-lizzie' into feature-search-improvements