259a614314
Conflicts: project/jni/application/commandergenius/AndroidAppSettings.cfg
Conflicts: project/jni/application/commandergenius/AndroidAppSettings.cfg