Removes templating behaviour
Merge branch 'master' of github.com:socd-io/Activity