update menu order
add resizable: true config
Merge branch 'origin/master'

Conflicts:
	web/js/project/projectList.js
	web/js/salescontract/scList.js
add resizable: true,