Added fullscreen and grid bindings
Merge branch 'develop'