Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' into develop-final-stage-003
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' into develop-final-stage-003
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' into develop-final-stage-003
Remove argument from start
Properly remove argument from start
Fix typo
Merge pull request #344 from mbehrooz/socketreset

Socket robustness
Update logging spec
Update Disco src.zip
Update disco.jar
Update Disco
update docs
New instruction and some edits.

+ The Video Capturing server.
Merge pull request #345 from mshayganfar/develop-final-stage-003

Minor changes on instructions and Reeti's Capturing Service.
update docs