Fixed template script problems
Merge branch 'master' of github.com:educoder/neighbourhood-safari