Merge branch 'asset' into liangnaihua
modify settings.py