data from database
Data on MaintenanceQandP retrieved from database
Merge branch 'master' of https://github.com/TimvanSteenbergen/tpg

Conflicts:
	config/autoload/database.local.php
	module/Maintenance/view/maintenance/maintenance/qandp.phtml