Add minimal WebSockets support and dependencies
Merge branch 'editor' of git.vincent.sh:flat/flat into editor

Conflicts:
	public/js/editor/controllers.js
update package.json
Fix some bugs with socket.io
Merge branch 'editor' of git.vincent.sh:flat/flat into editor
update toolbar to be compliant with fermata
Fix synthax error in services.js
Fix all bugs for socket.io
improve drag and drop
Merge branch 'master' into editor
improve interactivity
patch error check on mouse interac
Merge branch 'master' into interac
Fix callback bug in Player
patch bug, finding Note on large drag and drog
Silent notes are not played by Player
Merge branch 'editor'
Starting real time: join
Fixes space indent
Merge branch 'master' of git.vincent.sh:flat/flat into editor