home layout updated
home layout updates
db query efficiency part 1
pulled master
header corrections
Merge branch 'master' of github.com:CapstoneFleetIntelligience/Fleet into UI
fixed merge conflict
Merge branch 'master' of github.com:CapstoneFleetIntelligience/Fleet
misc updates
Merge branch 'master' of github.com:CapstoneFleetIntelligience/Fleet into UI
bkgd change, misc
Merge branch 'development'

Conflicts:
	application/models/delivery.php
Fix to the new customer modal.