Merge branch 'master' of https://github.com/flftfqwxf/plugins.git

Conflicts:
	demos/index.html

Signed-off-by: flftfqwxf <flftfqwxf@qq.com>
Merge branch 'master' of https://github.com/flftfqwxf/plugins.git