define ALLOWED_HOSTS
Merge remote-tracking branch 'origin/master' into design-refactor