KeyEvent
Merge branch 'master' into Widget

Conflicts:
	application.cpp