add propress monitor to mergedriver installer

Conflicts:

	plugins/vcs/common/models/jetbrains/mps/vcs/platform/mergedriver.mps
	plugins/vcs/common/source_gen.caches/jetbrains/mps/vcs/platform/mergedriver/dependencies
	plugins/vcs/common/source_gen.caches/jetbrains/mps/vcs/platform/mergedriver/generated
	plugins/vcs/common/source_gen/jetbrains/mps/vcs/platform/mergedriver/trace.info
fix error: git global installer didn't show dialog
Merge branch 'mergeDriverProgress' into defaultEditor
show node.getPresentation() instead of node.getName()
move testDefaultEditor language
if script is up-to-date don't write it
run GeneratorsRunner
Merge remote-tracking branch 'remotes/origin/master' into simon
make