Merge branch 'KeyEvent' into HomeView
Merge branch 'HomeView'