different connectors can be chosen when starting the node from the command line
Merge branch 'future/0.1.0' of github.com:Stratio/stratio-meta into future/0.1.0

Conflicts:
	meta-connector/src/main/scala/com/stratio/connectors/ConnectorApp.scala
restore file