fixed routing for globalsettings
Merge branch 'feature/refactor-ug-pg-logic' of https://github.com/unikent/programmes-plant into refactor/menus-and-links

Conflicts:
	application/views/admin/inc/sidebar.php