new structure
Merge branch 'future/0.1.0' of github.com:Stratio/stratio-meta into future/0.1.0
connector server actor is now connector manager actor
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/ServerActor.scala