feature model name included in satisfiability dialog
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/org.js.model.feature.csp/src/main/java/org/js/model/feature/csp/CSPAnalyzer.java