Merge branch 'hotfix/github-cleanup'
Merge branch 'release/release_1.1'
Merge branch 'release/1.2.0'
comment out unused media root/url settings; add allowed hosts config
Merge branch 'master' into develop - updated default settings
update dev version after releasing 1.2.0