first steps to multiple marking
Merge remote-tracking branch 'origin/master'
second steps to multiple marking
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/js/mindmap-factoryMethod.js