added escape key to keyhandler
Merge branch 'develop'