Merge branch 'organize-columns-command' into development

Conflicts:
karma-web/src/main/webapp/js/tableOptions.js
karma-web/src/main/webapp/tableOptionsDialogs.jsp