simpleVarComplete
simpleVarComplete
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/func/system/config/FunctionMgr.xhtml