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

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