Merge branch 'master' into bug1018

Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_cn.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties

java/com.sap.sailing.server.gateway/main.css

@@ -1,80 +1,80 @@
-/* line 2, _reset.sass */
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-size: 100%;
-  font: inherit;
-  vertical-align: baseline; 
-}
-
-body {
-  height: 100%;
-  color: #222222;
-  font-size: 14px;
-  font-family: OpenSansRegular, Arial, Verdana, sans-serif;
-  font-weight: normal;
-  margin: 10px;
-  padding: 0px;
-  line-height: 18px; 
-}
-
-h1 {
-  font-size: 16px;
-  font-family: OpenSansRegular, Arial, Verdana, sans-serif;
-  font-weight: bold;
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-
-h2 {
-  font-size: 16px;
-  font-family: OpenSansRegular, Arial, Verdana, sans-serif;
-  font-weight: normal;
-  margin-top: 5px;
-  margin-bottom: 10px;
-}
-
-table td, table th
-{
-    padding: 5px;
-}
-
-table { 
-  border-spacing:0;
-  border-collapse:collapse;
-}
-
-table thead tr td {
-	background-color: #eeeeee;
-}
-
-table tbody tr:nth-child(odd) td {
-	background-color: #cccccc;
-}
-
-table tbody tr:nth-child(even) td {
-	background-color: #dddddd;
-}
-
-a {
-  text-decoration: none;
-  color: #0066b3; 
-}
-
-a:hover {
-    text-decoration: underline; 
-}
-
+/* line 2, _reset.sass */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline; 
+}
+
+body {
+  height: 100%;
+  color: #222222;
+  font-size: 14px;
+  font-family: 'Open Sans', Arial, Verdana, sans-serif;
+  font-weight: normal;
+  margin: 10px;
+  padding: 0px;
+  line-height: 18px; 
+}
+
+h1 {
+  font-size: 16px;
+  font-family: 'Open Sans', Arial, Verdana, sans-serif;
+  font-weight: bold;
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+
+h2 {
+  font-size: 16px;
+  font-family: 'Open Sans', Arial, Verdana, sans-serif;
+  font-weight: normal;
+  margin-top: 5px;
+  margin-bottom: 10px;
+}
+
+table td, table th
+{
+    padding: 5px;
+}
+
+table { 
+  border-spacing:0;
+  border-collapse:collapse;
+}
+
+table thead tr td {
+	background-color: #eeeeee;
+}
+
+table tbody tr:nth-child(odd) td {
+	background-color: #cccccc;
+}
+
+table tbody tr:nth-child(even) td {
+	background-color: #dddddd;
+}
+
+a {
+  text-decoration: none;
+  color: #0066b3; 
+}
+
+a:hover {
+    text-decoration: underline; 
+}
+

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/CourseJsonExportServlet.java

@@ -87,7 +87,7 @@ public class CourseJsonExportServlet extends AbstractJsonHttpServlet {
             result = new JSONObject();
         }
         
+        setJsonResponseHeader(response);
         result.writeJSONString(response.getWriter());
-        response.setContentType("application/json");
     }
 }

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/MarkPositionsJsonExportServlet.java

@@ -98,8 +98,8 @@ public class MarkPositionsJsonExportServlet extends AbstractJsonHttpServlet {
             }
         }
         
+        setJsonResponseHeader(response);
         result.writeJSONString(response.getWriter());
-        response.setContentType("application/json");
     }
 
     @SuppressWarnings("unused") //unused since course area has no position yet

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/MarksJsonExportServlet.java

@@ -80,8 +80,8 @@ public class MarksJsonExportServlet extends AbstractJsonHttpServlet {
             }
         }
         
+        setJsonResponseHeader(response);
         result.writeJSONString(response.getWriter());
-        response.setContentType("application/json");
     }
     
     private UUID toUUID(String value) {

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupJsonExportServlet.java

@@ -78,8 +78,8 @@ public class RaceGroupJsonExportServlet extends AbstractJsonHttpServlet {
             }
         }
 
+        setJsonResponseHeader(response);
         result.writeJSONString(response.getWriter());
-        response.setContentType("application/json");
     }
 
     private UUID toUUID(String value) {