merge before sending messages to detect connectors
Merge branch 'future/0.1.0' of github.com:Stratio/stratio-meta into future/0.1.0

Conflicts:
	meta-server/src/main/scala/com/stratio/meta2/server/actors/ConnectorManagerActor.scala