add settings for modules
add settings for modules
merged. resolved conflicts add-new-case.htm, index.js
Merge branch 'Testing' of https://github.com/scorelab/OpenDF into Testing

Conflicts:
	OpenDF-web/src/main/webapp/js/index.js
	OpenDF-web/src/main/webapp/templates/index/add-new-case.htm