Merge branch 'master' into bug4006

Conflicts:
	java/com.sap.sailing.www/release_notes_admin.html

java/com.sap.sailing.www/release_notes_admin.html

@@ -27,6 +27,7 @@
                             time allowances relevant for Performance Curve Scoring (PCS) and offers a link to the
                             official PDF version of the respective certificate, based on its reference number.
                         </li>
+                        <li>Improved ESC/Enter key handling in user role/permission editing dialog</li>
                         <li>The "Replication" panel in the "Advanced" category now has improved information about the
                             replicables shown. An advanced replica information string may reveal more than just the address,
                             and the address is now resolved through any <tt>X-Forwarded-For</tt> header fields present