Merge conflict fix

README.mkd

@@ -3,12 +3,32 @@
 This is the software that is running the site
 [busylissy](http://busylissy.com). Busylissy started as a learning project for
 the us at [Bread and Pepper](http://breadandpepper). We also still use it to
-manage our own project.
+manage our own projects.
 
 Recently Busylissy was blogged about and reached a new high of 2.000 users.
 Because we are very busy working on other web applications we have decided to
 open source it.
 
+# F.A.Q.
+
+## Are you going to ask money to use Busylissy?
+
+No. We will keep Busylissy in the public domain and pay for the hosting by
+ourselves. When the costs of hosting keep going up we will have to consider
+placing banners or asking for donations.
+
+## Can I have Busylissy in language X 
+
+Yes. We would love to have as many languages as possible. That's one of the
+reasons the application is open source. It would be great if you would be
+willing to translate the translation file found in ``locales`` to your own
+language.
+
+## Why have you open-sourced Busylissy?
+
+We didn't have the time to make Busylissy the web application it could be. So
+we hope that the community can take Busylissy to the next level.
+
 # Credits
 - [Django](www.djangoproject.com) is the foundation on which Busylissy is
 build.

blproject/forms.py

@@ -45,7 +45,9 @@ def clean_tags(self):
                 tags += tag + ","
 
         # Project name must always be a tag
-        project_tag = slugify(self.cleaned_data['name'])
+        # getting name field if not cleaned
+        name = self.fields["name"] or self.cleaned_data["name"]
+        project_tag = slugify(name) # getting name field
         if project_tag not in tag_list:
             tags = project_tag + ',' + tags
 

settings.py

@@ -34,7 +34,7 @@
 
 ADMIN_MEDIA_PREFIX = '/media/admin/'
 
-SECRET_KEY = '9*1^o17$q*3f*a63gc)pavb+8h3nf#$&)tcx5_a2n^u^kgxf!c'
+SECRET_KEY = 'dummy'
 
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.load_template_source',