PR from andy butland manually added

Adds Pixes unit to rte config field, close buttons to grid config
dialogs

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html

@@ -31,6 +31,10 @@
     <div class="umb-panel-footer">
         <div class="umb-el-wrap umb-panel-buttons">
             <div class="btn-toolbar umb-btn-toolbar pull-right">
+                <a href ng-click="close()" class="btn btn-link">
+                     <localize key="general_cancel">Cancel</localize>
+                </a>
+
                 <a href ng-click="saveAndClose()" class="btn btn-primary">
                     <localize key="buttons_save">Save</localize>
                 </a>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html

@@ -21,6 +21,10 @@
         <div class="umb-panel-footer">
             <div class="umb-el-wrap umb-panel-buttons">
                 <div class="btn-toolbar umb-btn-toolbar pull-right">
+                    <a href ng-click="close()" class="btn btn-link">
+                         <localize key="general_cancel">Cancel</localize>
+                    </a>
+
                     <a href ng-click="saveAndClose(gridConfigEditor.$valid)" class="btn btn-primary">
                         <localize key="buttons_save">Save</localize>
                     </a>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html

@@ -31,6 +31,6 @@
 	</umb-control-group>
 
     <umb-control-group label="Maximum size for inserted images" description="0 to disable resizing">
-        <input type="number" ng-model="model.value.maxImageSize" class="umb-editor-tiny" placeholder="Width/Height" /> 
+        <input type="number" ng-model="model.value.maxImageSize" class="umb-editor-tiny" placeholder="Width/Height" /> Pixels
     </umb-control-group>
 </div>