Updating to latest codebase
Merge branch 'master' of github.com:bmx269/servicebay