Merge branch 'hotfix/remove-validate-button'
no more submodules in master, either
add back artifacts
Merge branch 'enhancement-no-submodules-master'
Not required anymore

Based on Simon's response here - https://github.com/att/rcloud/issues/340#issuecomment-35177826
Merge pull request #342 from smschauhan/patch-3

oc.init.R has been superseded by rcloud.support
disable sorting in read-only mode
use single port for HTTP and WebSockets; closes #316
checking workaround for #303 into master

rcs.ff does not function for me otherwise...
Merge branch 'hotfix/rcs-ff-workaround' into develop

Conflicts:
	htdocs/lib/js/rserve.js
fix bug where other's notebook not shown if not already in tree

consequence of delayed DOM construction
Merge branch 'develop' into feature-scratchpad

Conflicts:
	htdocs/css/main.css
	htdocs/js/rcloud_bundle.min.js
	htdocs/shell_tab.js
Merge branch 'feature-scratchpad' of https://github.com/att/rcloud into feature-scratchpad

Conflicts:
	htdocs/css/main.css
	htdocs/js/rcloud_bundle.min.js