#4 merging flow manager
Merge remote-tracking branch 'origin/development' into flowmanager
#4 merging into dev