Ensure that the help popups won't run off the screen if opened right near the bottom of the viewport. Fixes bug #1787.

Note if the popup is bigger than the viewport then things get weird. I don't think that case is worth worrying about.

Conflicts:

	htdocs/lib/version.php

Remove links in search results where users are in institutions which are not administered by the logged in user

Merge branch 'institutionaladmin' of git+ssh://git.catalyst.net.nz/var/git/mahara into institutionaladmin