Adding options for separate client/server websocket settings
Merge pull request #531 from jprjr/master

Add options for separate client/server websocket settings
SSL detection correction

$protocol always equals 'https' because $_SERVER['HTTPS'] !== 'off' always evaluates to true which causes the shared links to always use https even if the server doesn't use ssl.
Merge pull request #545 from smandon/sma-bugcorrection

SSL detection correction
Merge branch 'master' of https://github.com/DepaMarco/pydio-core into develop
FIX: S3 driver does not handle minisite path correctly
Merge branch 'develop' of https://github.com/pydio/pydio-core into develop