[FIX] Re-Commit error messages and Code Formatting
Merge branch 'android_1_client_development' of https://github.com/blstream/CaptureTheFlag into android_1_client_development