Fix view jump when focus returns to window
Merge branch 'master' into cursorjump

Conflicts:
	src/inputhandler.cpp
Merge pull request #20 from voxelinc/cursorjump

Fix view jump when focus returns to window