Merge remote branch 'origin/master'

Conflicts:
	docs/TODO

docs/TODO

@@ -10,6 +10,8 @@
 * Jquery upload document upload form with ajax widget                  - NOT NEEDED (commit: b0f31f2a8f82ff0daca081005f2fcae3f5573df5)
 * Rename dropbox from document edit view                               - DONE
 * Ability to rename staging file during upload                         - DONE
+* Implement single sign on or LDAP for intranets                       - DEFERRED, provided by Django AuthBackends
+* Database storage backend (sql, nosql: [mongodb])                     - DEFERRED, provided by https://bitbucket.org/david/django-storages/wiki/Home
 * Document list filtering by metadata
 * Filterform date filtering widget
 * Validate GET data before saving file
@@ -20,13 +22,25 @@
 * Show last 5 recent metadata setups for easy switch
 * Change to use model signals
 * Allow document type to be changed in document edit view
-* Implement single sign on or LDAP for intranets
 * Encrypting storage backend
 * Indicate in generic list which document don't exist in storage backend
-* Database storage backend (sql, nosql: [mongodb])
 * Add css grids
 * Document previews
 * Recognize multi-page documents
 * Staging file previews
 * Autodelete empty fs directories
 * Auto check and delete dead sym links
+* Document model's delete method might not get called when deleting in bulk
+    from a queryset
+* Allow metadata entry form to mix required and non required metadata
+* Link to delete and recreate all document links
+* MuliThreading deferred OCR
+* Document previews on demand w/ imagemagick
+* Versioning support
+* Generic document anotations using layer overlays
+* Permissions
+* Roles
+* Workflows
+* Scheduled maintenance (cleanup, deferred OCR's)
+* Show document metadata in document list
+* Show abbreviated uuid in document list