cleaning old code
cleaning code
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/meta/server/actors/ConnectorActor.scala