Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_raomeng

# Conflicts:
#	app_modular/appme/src/main/java/com/uas/appme/settings/activity/SelectLanguageActivity.java

app_core/common/src/main/res/values/array.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>