Refactored BusServiceDAO.
Merge branch 'master' of github.com:BusTrack/bustrack