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

Conflicts:
	templates/admin_index.html
change conf parse
Merge remote-tracking branch 'origin/master'

Conflicts:
	application.py
change conf parse
Merge remote-tracking branch 'origin/master'