some more simpledata route fixing
fix awards tests
do validation the right way in schools
globalsettings data does not need year. take it out
Start refactoring fields
Merge branch 'feature/refactor-ug-pg-logic' of github.com:unikent/programmes-plant into feature/refactor-ug-pg-logic

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