Latest changes on windows build.
Merge branch 'master' of https://github.com/mjblocko/sparkweave-connector
Merge branch 'master' of https://github.com/mjblocko/sparkweave-connector
commit to github.
Merge branch 'master' of https://github.com/mjblocko/sparkweave-connector

Conflicts:
	demo/FileToSparkWeave/flows/FileToSparkWeave.mflow
	demo/FileToSparkWeave/src/main/app/FileToSparkWeave.xml