Removed instrument filter hardcoding refs #2320
Exported chosen settings
Merge branch 'master' of https://github.com/dragos-dumi/cms.project into dragos-dumi-master

Conflicts:
	cms_project.module
Merge branch 'dragos-dumi-master'