clear base template
Merge branch 'master' of https://bitbucket.org/lpakula/service
clear base template
Merge branch 'master' of https://github.com/lpakula/service