updated TODO
TODO updated
updated server to support more flexible encryption in client
have signup sync working
merge conflict