Fixing problems from tests
Merge branch 'future/0.1.0' of https://github.com/Stratio/stratio-meta into future/0.1.0

Conflicts:
	meta-core/src/main/java/com/stratio/meta/core/grammar/Meta.g
	meta-core/src/main/java/com/stratio/meta/core/grammar/generated/Meta.tokens