update 1.1.7
Merge branch 'beta' of git@github.com:rose1988c/Caoliu.plug.git into
beta

Conflicts:
	caoliu.plug.js