Merge remote-tracking branch 'origin/master' into Dani
stage 1 framwork for de/encryption
new build-file (merged from master)
stage1 read server priv key
stage 1 read all keys
Merge branch 'Dani' - dani's SecureChannel