Fixes
Merge branch 'master' of https://github.com/flowgrammable/flowsim

Conflicts:
	src/backend/Makefile