Fix administration section in webapp
Automatic merge from branch-4.5

* origin/branch-4.5:
  Fix administration section in webapp