Updated templates
Merge branch 'master' of github.com:Noemj/governmaid