corrected xodr
added color hint
added gitflow infos
Conflicts:
	misc/git.README
Merge branch 'bidirectional' into develop

Conflicts:
	misc/git.README