Bringing back ConversationViewController changes to the master repo
TokenField should work, not tested yet because no friends on the server :(
Contact loading UI
basic adding of curve25519
shared secret code
will want a similar build script to build curve25519 lib for armv7 armv7s
basic test of generating shared secrets with curve25519
curve work done for the night-build script needs tweaking to work for arm