Merge pull request #281 from AssureNote/collaboration

Merge Collaboration
fix indent and order.
remove views/javascript/config.jade
Merge remote-tracking branch 'origin/master' into refactoring_server
Merge pull request #283 from AssureNote/refactoring_server

Refactoring server
Updated socket.io.d.ts
fixed color reset problem and confirm reset color is working ref.#271
disable re-send 'connect' command ref#291