Fix #271
Merge branch 'master' of github.com:chrisballinger/ChatSecure-iOS
Merge branch 'master' of github.com:chrisballinger/ChatSecure-iOS
podfile.lock update