Issue #945 Block 1 - maintain contributions
Merge pull request #949 from pecko/issue945

Issue #945 Block 1 - maintain contributions
Issue #945 Block 2 - stacked dots
Issue #945 Block 3 - Outline View
correct file suffixes
Issue #945 Block 4 - Grid Editor
Merge pull request #951 from pecko/issue945b

Issue #945 Block 3 - Outline View
Merge pull request #952 from pecko/issue945c

Issue #945 Block 4 - Grid Editor
Merge pull request #950 from pecko/issue945a

Issue #945 Block 2 - stacked dots
Issue #945 Block 5 - Narrative (diary) editor
Merge pull request #953 from pecko/issue945d

Issue #945 Block 5 - Narrative (diary) editor
Issue #945 Block 6 - Time Bars
Merge pull request #954 from pecko/issue945e

Issue #945 Block 6 - Time Bars
Issue #945 Block 7 - Others
Merge pull request #955 from pecko/issue945f

Issue #945 Block 7 - Others
Issue #956 - Minor UI changes
avoid compiler warnings
Merge pull request #957 from pecko/issue956

Issue #956 - Minor UI changes
Merge branch 'master' into 575_freq_part3

Conflicts:
	org.mwc.debrief.satc.integration/src/org/mwc/debrief/satc_interface/SATC_ImageHelper.java
	org.mwc.debrief.satc.integration/src/org/mwc/debrief/satc_interface/actions/CreateSolutionFromSensorData.java