Merge pull request #1 from kiddkai/master

upmerge
add the key binding to the menu and change overlayer from enable to Toggle
add error handler on client connection
Merge pull request #1 from LeiZeng/master

error handler and text on menu