Merge branch 'dev' of workflow.ijs.si:mothra into dev

Conflicts:
	mothra/settings.py

mothra/settings.py

@@ -198,6 +198,7 @@ else:
         'workflows.bioinformatics',
         'workflows.subgroup_discovery',
         'workflows.nlp',
+        'workflows.base',
         'website',
         'signuplogin',
         'django_extensions',

workflows/management/commands/import_package.py

 from django.core.management.base import BaseCommand, CommandError
 from workflows.models import Category, AbstractWidget, AbstractInput, AbstractOutput, AbstractOption
 from django.core import serializers
-from collections import Counter
+
+#dirty python2.6 fix
+try:
+    from collections import Counter
+except:
+    def Counter(list):
+        return set(list)
+
 from optparse import make_option