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

Conflicts:
	apps/base/models.py
	data_model/data/department_analyse.json
change conf parse