modify fiber setting
Merge branch 'dev'

Conflicts:
	testproject/settings_default.py
	testproject/testproject_db