Merge pull request #74 from ColinWa/master

Mother of Fixes
FIxes for siteServiceLogs serviceBy and siteUnitServiceLog service by plus test cases
FIxes for siteServiceLogs serviceBy and siteUnitServiceLog service by plus test cases
Fleet Fuel Menu - eXecutive Dashboard Scope Creep Changes
Merge upstream/master