tests
Merge branch 'master' of https://github.com/lmarmiesse/FlexFlux.git

Conflicts:
	src/unit_tests/TestBind.java

resolved conflict
Merge branch 'master' of https://github.com/lmarmiesse/FlexFlux.git