Merge branch 'feature-s/more_tags' into 'dev'

models/tags.py dash characters in tags

Closes #2686

See merge request !86

server/web2py/applications/vidjil/models/tag.py

@@ -8,7 +8,7 @@ class TagManager(object):
         self.prefix = prefix
 
     def expression(self):
-        return ur'%s(\w+)' % self.prefix
+        return ur'%s([\w-]+)' % self.prefix
 
 class TagExtractor(TagManager):