Improved language selection
Merge branch 'master' of github.com:chrisballinger/ChatSecure-iOS

Conflicts:
	ChatSecure/en.lproj/Localizable.strings
Updated transfix strings