Merge some serialization fixes from the 8 branch
Email verification message
Merge branch 'master' of github.com:irccloud/ios into 8