Improve the logic for incoming chat selection, added offline page
Merge branch 'webby' into dev/temp