Handling of file sharingin server - part 1.
Merge branch 'develop' of https://github.com/alekgajos/Jamii into develop
Finally fixed the bug merging brush strokes on the whiteboard.
Merge branch 'develop' of https://github.com/matteozajac/Jamii into develop
Signaller server integrated with server.js
Before alek
alek merge