Aes and Mac
Merge branch 'Dani' - dani's SecureChannel
init
stage 1 complete :D
Merge remote-tracking branch 'origin/master' into Dani
stage 1 complete,
stage 2 - todo channel
Merge branch 'Philipp' into Dani
Merge branch 'Philipp' into Dani
fixed parantheses
serverside groupbid