added phones controller web socket
resolved merge conflict
serve static assests
Merge pull request #100 from mdidier9/production

Production