re #842 - Added fake query
Merge branch 'master' into feature/848-email

Conflicts:
	application/admin/component/districts/view/district/templates/default.html.php
re #343 - Added custom banner for 5427
Merge branch 'feature/848-email'
re #343 - Added custom banner for 5427
Merge branch 'master' into staging