Merge branch 'master' of https://github.com/ET-CS/django-jquery-file-upload into ET-CS-master

Conflicts:
	.gitignore
	fileupload/templates/fileupload/picture_form.html

Author: sigurdga

.gitignore

@@ -1,9 +1,10 @@
+db
 /media
-/db
 /bin
 /include
 /lib
 /local
 /share
 /env
 /venv
+*.pyc

fileupload/admin.py

@@ -0,0 +1,4 @@
+from fileupload.models import Picture
+from django.contrib import admin
+
+admin.site.register(Picture)

fileupload/models.py

@@ -22,6 +22,7 @@ def save(self, *args, **kwargs):
         self.slug = self.file.name
         super(Picture, self).save(*args, **kwargs)
 
+    # remove to leave file.
     def delete(self, *args, **kwargs):
         self.file.delete(False)
         super(Picture, self).delete(*args, **kwargs)