working with NOX flows
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gao_connection_manager.h