update tunnel, dependencies and SessionID collection regex
add setters for clientkey/secret
Merge remote-tracking branch 'upstream/master'