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/static/js/table.js

@@ -15,18 +15,20 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/* exported TableActions */
+
 $(function() {
 
     $("#domain_submit").click(function(event) {
         event.preventDefault();
         $("#domain_add").ajaxForm();
         $(this).closest("form").submit();
-        $.ajax({
+        $.ajax ({
             method:"get",
             url: window.location.pathname + "/../../ajax/domainlist",
             async: true,
             timeout: 900,
-            success:function(data){
+            success:function(data) {
                 $("#domain-table").bootstrapTable("load", data);
             }
         });