handling services
Merge branch 'dev-master' into templating