Nicer merge arrows
Merge branch 'develop' of https://github.com/Teun/git-flow-vis into develop

Conflicts:
	Vis/Web/Scripts/gitflow-visualize.js