Merge branch 'hotfix/DS_CssFixForEditFixtures' into development
Merge branch 'hotfix/DS_TableShowingNonAliasNamesAfterWeek10' into development
Backup
Merge branch 'master' into development
Merge branch 'hotfix/DS_FIXResultsScreenSort' into development
Merge branch 'hotfix/DS_FixForResultsPage' into development

Conflicts:
	db_backup/iwipreds.sql
Merge branch 'master' into development

Conflicts:
	db_backup/iwipreds.sql
Merge branch 'development' of https://github.com/danthaiwang/iwipreds into development

Conflicts:
	db_backup/iwipreds.sql
Latest DB backup.
Email reminders now set up and working.
Merge branch 'release/3.0'