Updated files
Merge branch 'master' of https://github.com/MOLEDesign/wwwTheGlasgowHub

Conflicts:
	modules/mod_zoofilter/tmpl/default.php