Merge branch 'hotfix/v0.12.2' into development

Conflicts:
	apps/common/__init__.py
	apps/documents/forms.py
	apps/feedback/__init__.py
	apps/history/__init__.py
	apps/main/__init__.py
	apps/scheduler/api.py
	apps/sources/models.py
	docs/releases/index.rst
	requirements/production.txt
	settings.py
	urls.py

apps/main/templates/project_description.html

@@ -3,7 +3,7 @@
 <link rel="stylesheet" href="{{ STATIC_URL }}css/famfamfam-silk-sprite.css" type="text/css" media="screen" />
     
 <p class="tc">
-    {% trans "Open source, Django based electronic document manager with custom metadata, indexing, tagging, file serving integration and OCR capabilities" %}
+    {% trans "Open source, Django based electronic document manager with custom metadata, indexing, tagging, file serving integration, digital signature support and OCR capabilities" %}
 </p>
 <p class="tc">
     <span class="famfam active famfam-world_go"></span><a href="http://www.mayan-edms.com">http://www.mayan-edms.com</a>
@@ -18,7 +18,7 @@
     {% trans "Released under the GPL V3 License" %}
 </p>
 <div class="tc">
-    <img src="{{ STATIC_URL }}images/392336_7079-small.png"/>
+    <img src="{{ STATIC_URL }}images/mayan_logo_landscape_rough.png"/>
 </div>
 <div class="tc">
     <img src="{{ STATIC_URL }}images/gplv3-127x51.png"/>

apps/main/templates/verbose_login.html

@@ -3,7 +3,7 @@
 
 <p>{% trans "Version" %} {% app_version "main" %}</p>
 
-<p>Copyright &copy; 2011 Roberto Rosario.</p>
+<p>Copyright &copy; 2011, 2012 Roberto Rosario.</p>
 
 {% include "project_description.html" %}