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

Conflicts:
	apps/base/models.py
	static/analysis/analysis.html
change conf parse