Merge branch 'staging' into oo2

.jshintignore

@@ -1,19 +1,23 @@
 node_modules/
 www/bower_components/
 www/common/pdfjs/
+www/common/tippy/
+www/common/jquery-ui/
+www/common/onlyoffice/*
 
 server.js
-www/common/media-tag.js
+www/common/old-media-tag.js
 www/scratch
 
 www/common/toolbar.js
 www/common/hyperscript.js
-www/common/tippy.min.js
-www/common/onlyoffice/*
 
 www/pad/wysiwygarea-plugin.js
 www/pad/mediatag-plugin.js
 www/pad/mediatag-plugin-dialog.js
+www/pad/disable-base64.js
+
+www/kanban/jkanban.js
 
 www/common/media-tag-nacl.min.js