Fixed service id
Merge branch 'solution' of github.com:purplemagma/ctof14-service into solution