First draft of key exchange
Fixed some stuff relating to key exchange
Merge branch 'develop-mators11' of github.com:oskopek/CryptoIM into develop-mators11