Merge branch 'Develop'

# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt

cps/templates/http_error.html

@@ -17,10 +17,10 @@
     {% endif %}
   </head>
   <body>
-    <div class="container text-center">
+    <div class="text-center">
         <h1>{{ error_code }}</h1>
         <h3>{{ error_name }}</h3>
-        <a href="{{url_for('index')}}" title="{{ _('Back to home') }}">{{_('Back to home')}}</a>
+        <a href="{{url_for('web.index')}}" title="{{ _('Back to home') }}">{{_('Back to home')}}</a>
     </div>
   </body>
 </html>