corrected xodr
added gitflow infos
Conflicts:
	misc/git.README