Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLeg.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
The merge conflict was largely caused by the introduction of target time estimation which conflicted with a few
new methods introduced on branch bug1018
# By Christopher Ronnewinkel (D036654) (42) and others
# Via Christopher Ronnewinkel (D036654) (20) and others
* 'design2015' of ssh://sapsailing.com/home/trac/git: (101 commits)
fixing bug 2789 (device configuration caption panel e-mail uneditable)
adjusted message texts for "uploaded file" instead of "uploaded image" only
fixed re-opened bug 1963 comment #23 by showing the flag image, not the competitor image, in the nationality/sail number column in leaderboard if present
fixed rendering of competitor image and flag image in admin console competitor table wrapper; see bug 1963 comment #23
fixing bug 2780 by adding flag URI change handling to listener interface and CompetitorImpl setter implementation; leaderboard cache handling updated
Fixed Leaderboard positioning for lower resolutions
Fixed aligment of event overview year title
Added design2015 messages to StringMessages_cn.properties
added missing dashboard StringMessageProperties to cn file and removed not used ones
handle sparse-simulation-data-exception; further improvement for finish-phase of opportunist-360;
consolidated imports
replaced remove icon by text to make button porpose clearer
bug1963: also offer image upload for flag image; fixed swapping problem of competitor image and flag image
Fixed bug2762
New polars maneuver api uses ManeuverType rather than LegType
check for zero-speed due to missing wind or polar data; extend get-even-timed-path for the case of two cornerpoints per step; scale turning step of finish-phase 1-turner to layline; fix plausibility check;
fix finish-phase of opportunist-360 to avoid steep-angle-steps;
Added chinese translation
support start-line initialization in tree-grow-360; fix orientation in initial steps of opportunist-360;
Fixed errors after merge
...