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

Conflicts:
	apps/base/models.py
	data_model/data/client_js_config.json
change conf parse
Merge remote-tracking branch 'origin/master'

Conflicts:
	data_model/data/client_js_config.json
change conf parse
Merge remote-tracking branch 'origin/master'

Conflicts:
	application.py
	apps/base/models.py
	config/hcm_core.conf
	errors.py
	static/org/controller.js
change conf parse