update settings
Merge branch 'master' of github.com:drhops/moon12
link images from s3
strip /static/ from images in admin