Automatic merge from branch-4.5

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

diff --cc server/sonar-web/src/main/webapp/WEB-INF/app/controllers/application_controller.rb
Simple merge