Allow website edition
Merge branch 'master' into rodano
Fix website configuration UI
Merge branch 'master' into rodano