Merge branch 'master' of https://github.com/fisker23/FlowSolid

Conflicts:
	nbproject/private/private.xml