Merge branch 'hotfix/static-url-2' into staging
ignore local settings
fixing asset domain, finally
Merge branch 'staging' into gh-pages