add viewshortcut and gui bugfix

I think once a commit is pushed you can't remove it...
Maybe that's something to do with fetch/merge difference.

The problem is your master branch with the weird merge pull request stuff :D.
Maybe you should refork the project, create the new branch and add the clean commits... or maybe I can just merge the PR and see what happens :)

hey @stephomi I use 
git push -f
that delete the remote merge commit ,so lead I can apply my patch,then make a new PR
thanks a lot.