added tags to entries on templates
Merge branch 'master' of https://github.com/aleosd/sw_mon