some more
Merge branch 'master' of https://github.com/ecybrain/brainbase

Conflicts:
	freeplane/cy_start_develop.mm

merge file