added and tested Grid
Fixed annotations, and key classes.
Merge branch 'master' of https://github.com/molnarp/stratosphere-workshop-template
Merge branch 'master' of https://github.com/komoot/stratosphere-workshop-template