Merge branch 'master' into 'test'

Master

See merge request !10

.gitignore

@@ -59,7 +59,7 @@ docs/_build/
 fabfile.py
 settings.online.py
 /gaia/settings.py
-#settings_local.py
+settings_local.py
 media/
 log/
 crawldata/

geoserver/settings_local.py

-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = ['*']
-
-#**********************************Celery Config*************************************************
-
-CELERY_BROKER_URL = 'redis://127.0.0.1:6379/0' # Broker配置，使用Redis作为消息中间件
-CELERY_RESULT_BACKEND = 'redis://127.0.0.1:6379/0' # BACKEND配置，这里使用redis
-CELERY_RESULT_SERIALIZER = 'json' # 结果序列化方案
-
-
-#***********************************Redis Config***********************************************
-REDIS_HOST="127.0.0.1"
-REDIS_PASSWORD=""
-REDIS_PORT=6379
-REDIS_DB=0
-
-#***********************************************************************************
\ No newline at end of file