WF configurations
Merge branch 'master' of https://github.com/dougkelly88/OpenFLIM-HCA

Conflicts:
	build/built-jar.properties