测试提交
test commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	app/app.iml
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/aincvy/console/Controller.java
	app/src/main/java/com/aincvy/console/SettingPlugin.java
	app/src/main/java/com/aincvy/model/Config.java
	app/src/main/res/values/strings.xml