Setup public keys on initial contact
Setup the AESKey
Fixed null pointer error
Merge branch 'master' into T3