Merge pull request #68 from hawesie/nick_concurrency

changes to handle concurrency - cherry-picked
Merge pull request #69 from hawesie/hydro-devel

Visualisation and testing functionality
Merge pull request #70 from hawesie/hydro-devel

Adding timeout to scheduler.
Added time meaurement for generating constraints and added generation of random schedules
Fixed issue when no file is given for saving in scheduler
Merge remote-tracking branch 'upstream/hydro-devel' into hydro-devel

Conflicts:
	scheduler/src/scheduler.cpp
Scheduler supports a task, which has the flag NOW
Merge pull request #71 from mudrole1/hydro-devel

Added extra time measurement and generation of random schedules
Adding feedback to test action node.