Added Chat, added playlist

Added methods to server and model.js
Fixed the Merge Problems
Merge branch 'master' of https://github.com/simonlast/popcorn-music