change conf parse
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/common/directive/templates/list_emp.html
change conf parse
Merge remote-tracking branch 'origin/master'