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

Conflicts:
	static/admin/monitor_base.js
change conf parse