Multi-select draft
Merge branch 'master' of https://github.com/TNOCS/MultiCriteriaAnalysis

Conflicts:
	MultiCriteriaAnalysis/public/views/scenarios/ScenariosCtrl.ts
Merge branch 'master' of https://github.com/TNOCS/MultiCriteriaAnalysis
Criteria merge
Merge branch 'master' of https://github.com/TNOCS/MultiCriteriaAnalysis
Merge branch 'master' of https://github.com/TNOCS/MultiCriteriaAnalysis
Enable/disable reordering of tree-view
Merge branch 'master' of https://github.com/TNOCS/MultiCriteriaAnalysis