Adding sockjs
Adding some datas
Merging