Merge branch 'master' into mapquest

Conflicts:
	net/systemeD/potlatch2/Toolbox.mxml
	version.as.template

diff --cc net/systemeD/potlatch2/TagViewer.mxml
Simple merge

diff --cc net/systemeD/potlatch2/Toolbox.mxml
index 7637c8f,a553ab6..241d5f4
--- 1/net/systemeD/potlatch2/Toolbox.mxml
--- 2/net/systemeD/potlatch2/Toolbox.mxml
+++ b/net/systemeD/potlatch2/Toolbox.mxml
@@@ -16,10 -21,11 +16,11 @@@
                        enabled="{canDo('delete')}" 
                        alpha="{getAlpha('delete')}" 
                        toolTip="{deleteToolTipText()}" 
 -                      width="28" height="28" textAlign="left" y="4" x="6" paddingLeft="6" paddingRight="0" />
 +                      width="24" height="24" />
  
-         <mx:HBox width="24" height="24" y="4" x="36" borderStyle="solid" cornerRadius="12" click="reverseClicked();" horizontalAlign="center" verticalAlign="middle">
-             <mx:ViewStack id="rotateButtonStack">
 -        <mx:HBox id="reverseButton" width="28" height="28" y="4" x="36" borderStyle="solid" cornerRadius="4"
 -                  click="reverseClicked();" horizontalAlign="center" verticalAlign="middle" toolTip="Reverse direction (V)">
++        <mx:HBox id="reverseButton" width="24" height="24" y="4" x="36" borderStyle="solid" cornerRadius="12" 
++                        click="reverseClicked();" horizontalAlign="center" verticalAlign="middle" toolTip="Reverse direction (V)">
+             <mx:ViewStack id="rotateButtonStack" creationPolicy="all">
                  <mx:HBox id="arrowBoxWrapper"><!-- changing the viewstack back onto a rotated hbox causes positioning glitches, hence this wrapper -->
                      <!-- I can totally recommend adding borderStyle="solid" to arrowBox when debugging -->
                      <mx:HBox id="arrowBox" horizontalAlign="center" verticalAlign="middle" width="24" height="24">
@@@ -50,8 -54,9 +49,9 @@@
                        enabled="{canDo('split')}" 
                        alpha="{getAlpha('split')}" 
                        toolTip="Split way (X)" 
 -                      width="28" height="28" textAlign="left" y="4" x="66" paddingLeft="8" paddingRight="0" />
 +                      width="24" height="24" />
                <mx:Button icon="@Embed('../../../embedded/merge.svg')" 
+                       id="mergeButton"
                        click='doMerge();'
                        enabled="{canDo('merge')}" 
                        alpha="{getAlpha('merge')}" 
@@@ -65,20 -71,23 +66,23 @@@
                        enabled="{canDo('straighten')}" 
                        alpha="{getAlpha('straighten')}" 
                        toolTip="Straighten way" 
 -                      width="28" height="28" textAlign="left" y="34" x="6" paddingLeft="5" paddingRight="0" />
 +                      width="24" height="24" />
                <mx:Button icon="@Embed('../../../embedded/circle.svg')" 
+                       id="circulariseButton"
                        click='doCircularise();' 
                        enabled="{canDo('circularise')}" 
                        alpha="{getAlpha('circularise')}" 
                        toolTip="Make circular" 
 -                      width="28" height="28" textAlign="left" y="34" x="36" paddingLeft="4" paddingRight="0" />
 +                      width="24" height="24" />
                <mx:Button icon="@Embed('../../../embedded/quadrilateralise.svg')" 
+                       id="quadrilateraliseButton"
                        click='doQuadrilateralise();' 
                        enabled="{canDo('quadrilateralise')}" 
                        alpha="{getAlpha('quadrilateralise')}" 
 -                      toolTip="Make right-angled (Q)"
 -                      width="28" height="28" textAlign="left" y="34" x="66" paddingLeft="6" paddingRight="0" />
 +                      toolTip="Make right-angled (Q)" 
 +                      width="24" height="24" />
                <mx:Button icon="@Embed('../../../embedded/parallel.svg')" 
+                       id="parralleliseButton"
                        click='doParallelise();' 
                        enabled="{canDo('parallelise')}" 
                        alpha="{getAlpha('parallelise')}" 

diff --cc potlatch2.mxml
Simple merge

diff --cc resources/imagery.xml
Simple merge

diff --cc version.as.template
index d04f0a9,8e51cc0..9288362
--- 1/version.as.template
--- 2/version.as.template
+++ b/version.as.template
@@@ -3,4 -3,4 +3,5 @@@
  // at some point in the future.
  
  public var build_number:String="@@@buildnumber@@@";
- public var version:String="0.5-MQ";
 -public var version:String="2.0";
++public var version:String="2.0-MQ";
++