EYETRACKER-102: increasing efficiency of query
Merge branch 'master' of github.com:IntersectAustralia/dc21

Conflicts:
	app/views/layouts/_head.html.haml
EYETRACKER-102: prepending '&' to = to escape though haml
Merge branch 'master' of github.com:IntersectAustralia/dc21
Merge branch 'master' of github.com:IntersectAustralia/dc21