- add settings choice (if needed)
Merge branch 'master' of github.com:onehippo/essentials