connector name
Merge branch 'master' of github.com:CELAR/app-orchestrator

Conflicts:
	orchestrator-daemon/src/main/java/gr/ntua/cslab/orchestrator/Main.java