Trying to fix mappings connection crash
Merge branch 'master' of github.com:chrisballinger/ChatSecure-iOS