Merge remote-tracking branch 'origin/master'

Conflicts:
	OilManage/WebRoot/editor/lib/init.js
Merge remote-tracking branch 'origin/master'