Jira CROSSDATA-135 https://crossdata.atlassian.net/browse/CROSSDATA-135 Solved & Grammar.md added
Merge branch 'release/0.1.0' of https://github.com/Stratio/crossdata into release/0.1.0
Merge with local branch
Conflicts resolved
Merge with local branch