Merge branch 'master' into development
Merge branch 'hotfix/DS_FixForResultsPage'
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.