Merge branch 'master' into snapshotserver

Conflicts:
	net/systemeD/potlatch2/panels/BackgroundPanel.mxml

diff --cc net/systemeD/halcyon/connection/Connection.as
Simple merge

diff --cc net/systemeD/potlatch2/TagViewer.mxml
index a5d43a06bd1d99a25c799e085625fd78da24db61,b2b62fddee728583b8892c2b697e272a20ee7fee..1e1070de2feb39e088d5afb7008b1d84b5203a6f
--- 1/net/systemeD/potlatch2/TagViewer.mxml
--- 2/net/systemeD/potlatch2/TagViewer.mxml
+++ b/net/systemeD/potlatch2/TagViewer.mxml
@@@ -210,20 -211,14 +211,21 @@@
      <sidepanel:BackgroundPanel id="backgroundPanelContents" width="100%"/>
    </mx:VBox>
  
 +  <!-- merge tags from background layer -->
 +
 +  <mx:VBox id="backgroundMergePanel" width="100%" height="100%" horizontalScrollPolicy="off" styleName="dndPanelVbox">
 +    <sidepanel:BackgroundMergePanel id="backgroundMergePanelContents" width="100%" />
 +  </mx:VBox>
 +
  </mx:ViewStack>
  
-   <mx:Script><![CDATA[
+   <fx:Script><![CDATA[
        import net.systemeD.halcyon.connection.*;
        import net.systemeD.halcyon.MapPaint;
 +      import net.systemeD.potlatch2.EditController;
        import net.systemeD.potlatch2.mapfeatures.*;
        import net.systemeD.potlatch2.utils.*;
+       import net.systemeD.controls.CollapsiblePanel;
  
        import mx.collections.*;
        import mx.containers.*;

diff --cc net/systemeD/potlatch2/panels/BackgroundPanel.mxml
index aaa44df0eb78916d52e6d16a4a753f2a57ae318d,9030a8bd6378695cd170fe47128e57a169fbfa12..2895e75560c87703e5165b7d8d8c1e110a1d2492
--- 1/net/systemeD/potlatch2/panels/BackgroundPanel.mxml
--- 2/net/systemeD/potlatch2/panels/BackgroundPanel.mxml
+++ b/net/systemeD/potlatch2/panels/BackgroundPanel.mxml
@@@ -12,18 -15,9 +15,18 @@@
        <mx:DataGridColumn editable="false" dataField="value" headerText="value" />
      </mx:columns>
    </mx:DataGrid>
 -  <mx:Text text="All the data copied to the main layer? Click 'complete'!" />
 -  <mx:Button label="Complete" click="markComplete()"/>
 +  <mx:ViewStack id="statusStack" resizeToContent="true" width="100%">
 +    <mx:VBox id="empty" />
 +    <mx:VBox id="not_complete">
 +      <mx:Text text="All the data copied to the main layer? Click 'complete'!" />
 +      <mx:Button label="Complete" click="markComplete()"/>
 +    </mx:VBox>
 +    <mx:VBox id="complete">
 +      <mx:Text text="This feature has been marked as complete. If this is wrong, press the button below." />
 +      <mx:Button label="Not complete" click="markNotComplete()"/>
 +    </mx:VBox>
 +  </mx:ViewStack>
-   <mx:Script><![CDATA[
+   <fx:Script><![CDATA[
  
        import net.systemeD.halcyon.connection.*;
        import net.systemeD.halcyon.MapPaint;
@@@ -73,16 -48,10 +76,16 @@@
        }
  
        private function markComplete():void {
 -            if (selectedEntity.connection is SnapshotConnection) {
 -                SnapshotConnection(selectedEntity.connection).markComplete(selectedEntity);
 -            }
 +          if (selectedEntity.connection is SnapshotConnection) {
 +              SnapshotConnection(selectedEntity.connection).markComplete(selectedEntity);
 +          }
 +      }
 +
 +      private function markNotComplete():void {
 +          if (selectedEntity.connection is SnapshotConnection) {
 +              SnapshotConnection(selectedEntity.connection).markNotComplete(selectedEntity);
 +          }
        }
        ]]>
-   </mx:Script>
+   </fx:Script>
  </mx:VBox>