update settings
Merge branch 'master' of github.com:littleq0903/fumoufeed

Conflicts:
	fumoufeed/conf/local_settings.py
	fumoufeed/conf/settings.py