move AOP configuration service point cuts into own template, to make it easier to override
Merge branch 'develop' of github.com:sculptor/sculptor into develop