massive eager loading
Merge branch 'master' of https://github.com/Aruk/test-git-new-site