fix commonBatchCombo bug
fix user
add site maintain
fix register
fix something
Merge branch 'develop'

Conflicts:
	extjs-app/app.js
	extjs-app/metadata/Application
add reportParams.label
Merge branch 'develop'
fix test error
extjs materialSheet add supplier field
extjs fix manufactureOrder layout
extjs materialSheetController 增加 supplier combo 處理
application zh_TW add materialSheet supplier label
Merge branch 'origin/develop'