Update service, nodetype
Merge branch 'master' of https://github.com/exo-codefest/2014-team-C
Merge branch 'master' of https://github.com/exo-codefest/2014-team-C