fixes bug where invite screen remained even after chaning event
Merge branch 'master' into integrate_home_page