avoid n+1 statements in controllers
Merge pull request #63 from alpha-tango/includes

avoid n+1 statements in controllers