Adding support for wasd controls
Merge branch 'develop'