fixed IV/Key helper function
Merge branch 'client'
Merge branch 'master' of https://github.com/mdaabs/Encrypted-Instant-Messenger