Merge branch 'master' of https://github.com/xstd/active_plugin.git

Conflicts:
	app/src/com/xstd/active/plugin/CoreService.java

Signed-off-by: Chrain <fly__u@163.com>
Merge branch 'master' of https://github.com/xstd/active_plugin.git