query optimized using includes
Merge branch 'feature/design-follow-develop' of github.com:DonutWorks/Ari into feature/issue-434

Conflicts:
	app/models/activity.rb
Merge pull request #435 from DonutWorks/feature/issue-434

query optimized using includes