Initial check-in
Merge remote-tracking branch 'remotes/rchat/master'