Order
Merge branch 'master' of https://github.com/WeberStudio/UKDEV
Merge branch 'master' of https://github.com/WeberStudio/UKDEV
Merge branch 'master' of https://github.com/WeberStudio/UKDEV
Merge branch 'master' of https://github.com/WeberStudio/UKDEV
Database
Merge branch 'master' of https://github.com/WeberStudio/UKDEV
Merge branch 'master' of https://github.com/WeberStudio/UKDEV
Sales Report
Merge branch 'master' of https://github.com/WeberStudio/UKDEV

Conflicts:
	gocart/controllers/admin/reports.php
	gocart/views/admin/includes/leftbar.php