Conflicts:
	Makefile
	git-flow-develop
fixed conflicts