Merge branch 'pr/87' into development

Conflicts:
	karma-web/src/main/webapp/js/tableColumnOptions.js
	karma-web/src/main/webapp/tableColumnDialogs.jsp
Merge branch 'development' of https://github.com/InformationIntegrationGroup/Web-Karma into development