Add basic online/busy/offline icon
Merge remote-tracking branch 'origin/master'