Merge branch 'master' into SIbranch
Replace .display-inline-children with .inline-list

Administration
Adjustments to configure-edit.html

Administration
Add "top-line" and toggle .form-actions accordingly in plugin-new.html and other fixes

Administration
Merge branch 'SIbranch'