Support upload files
Merge remote-tracking branch 'upstream/master'
Add chat using socket.io