Only a BUG FIX and clean-up.
Merge branch 'ios_client_development' of https://github.com/blstream/CaptureTheFlag into ios_client_development