update 1.1.7
Merge remote-tracking branch 'origin/master' into beta

Conflicts:
	caoliu.plug.js