by zhanyi
Merge remote-tracking branch 'origin/master'

Conflicts:
	_src/plugins/moverange.js
Merge remote-tracking branch 'origin/master'