Merge branch 'origin/develop' into feature/buildWin7_64

Conflicts:
	libraries/tuttle/src/tuttle/host/ComputeOptions.hpp
	libraries/tuttle/src/tuttle/host/graph/ProcessGraph.cpp