diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj
index 32047355..1d7059a7 100644
--- a/OurUmbraco.Site/OurUmbraco.Site.csproj
+++ b/OurUmbraco.Site/OurUmbraco.Site.csproj
@@ -707,8 +707,6 @@
     <Content Include="umbraco\assets\img\installer.jpg" />
     <Content Include="umbraco\assets\img\loader.gif" />
     <Content Include="umbraco\assets\img\logo.png" />
-    <Content Include="umbraco\assets\img\mocks\big-image.jpg" />
-    <Content Include="umbraco\assets\img\mocks\big-thumb.jpg" />
     <Content Include="umbraco\assets\img\nonodesbg.jpg" />
     <Content Include="umbraco\assets\img\transparent.png" />
     <Content Include="umbraco\assets\img\uploader\upload-illustration.png" />
@@ -716,6 +714,7 @@
     <Content Include="umbraco\ClientRedirect.aspx" />
     <Content Include="umbraco\config\lang\cs.xml" />
     <Content Include="umbraco\config\lang\en_us.xml" />
+    <Content Include="umbraco\config\lang\nb.xml" />
     <Content Include="umbraco\create\PartialView.ascx" />
     <Content Include="umbraco\create\PartialViewMacro.ascx" />
     <Content Include="umbraco\create\User.ascx" />
@@ -746,7 +745,6 @@
     <Content Include="umbraco\images\umbraco\icon_workflow.gif" />
     <Content Include="umbraco\installer.html" />
     <Content Include="umbraco\Install\Legacy\loadStarterKits.ascx" />
-    <Content Include="umbraco\js\app.dev.js" />
     <Content Include="umbraco\js\app.js" />
     <Content Include="umbraco\js\canvasdesigner.config.js" />
     <Content Include="umbraco\js\canvasdesigner.front.js" />
@@ -755,7 +753,6 @@
     <Content Include="umbraco\js\canvasdesigner.panel.js" />
     <Content Include="umbraco\js\init.js" />
     <Content Include="umbraco\js\install.loader.js" />
-    <Content Include="umbraco\js\loader.js" />
     <Content Include="umbraco\js\routes.js" />
     <Content Include="umbraco\js\umbraco.controllers.js" />
     <Content Include="umbraco\js\umbraco.directives.js" />
@@ -769,6 +766,7 @@
     <Content Include="umbraco\js\umbraco.testing.js" />
     <Content Include="umbraco\lib\angular-bootstrap\ui-bootstrap-tpls-0.10.0.min.js" />
     <Content Include="umbraco\lib\angular-dynamic-locale\tmhDynamicLocale.min.js" />
+    <Content Include="umbraco\lib\angular-local-storage\angular-local-storage.min.js" />
     <Content Include="umbraco\lib\angular\1.1.5\angular-cookies.js" />
     <Content Include="umbraco\lib\angular\1.1.5\angular-cookies.min.js" />
     <Content Include="umbraco\lib\angular\1.1.5\angular-loader.js" />
@@ -1072,11 +1070,8 @@
     <Content Include="umbraco\lib\angular\1.1.5\i18n\angular-locale_zu.js" />
     <Content Include="umbraco\lib\angular\angular-ui-sortable.js" />
     <Content Include="umbraco\lib\angular\angular.js" />
-    <Content Include="umbraco\lib\angular\tmhDynamicLocale.js" />
-    <Content Include="umbraco\lib\blueimp-load-image\load-image.all.min.js" />
     <Content Include="umbraco\lib\bootstrap-social\bootstrap-social.css" />
     <Content Include="umbraco\lib\bootstrap-tabdrop\bootstrap-tabdrop.js" />
-    <Content Include="umbraco\lib\bootstrap-tabdrop\bootstrap-tabdrop.min.js" />
     <Content Include="umbraco\lib\bootstrap\css\bootstrap-responsive.css" />
     <Content Include="umbraco\lib\bootstrap\css\bootstrap-responsive.min.css" />
     <Content Include="umbraco\lib\bootstrap\css\bootstrap.cosmo.min.css" />
@@ -1124,52 +1119,12 @@
     <Content Include="umbraco\lib\cssparser\cssparser.js" />
     <Content Include="umbraco\lib\datetimepicker\bootstrap-datetimepicker.js" />
     <Content Include="umbraco\lib\datetimepicker\bootstrap-datetimepicker.min.css" />
-    <Content Include="umbraco\lib\datetimepicker\bootstrap-datetimepicker.min.js" />
-    <Content Include="umbraco\lib\datetimepicker\langs\datetimepicker.pt-BR.js" />
     <Content Include="umbraco\lib\font-awesome\css\font-awesome.min.css" />
     <Content Include="umbraco\lib\font-awesome\fonts\fontawesome-webfont.svg" />
-    <Content Include="umbraco\lib\jquery-file-upload\jquery.fileupload-angular.js" />
-    <Content Include="umbraco\lib\jquery-file-upload\jquery.fileupload-image.js" />
-    <Content Include="umbraco\lib\jquery-file-upload\jquery.fileupload-process.js" />
-    <Content Include="umbraco\lib\jquery-file-upload\jquery.fileupload.js" />
     <Content Include="umbraco\lib\jquery-ui-touch-punch\jquery.ui.touch-punch.js" />
     <Content Include="umbraco\lib\jquery-ui\jquery-ui-1.10.4.custom.min.css" />
     <Content Include="umbraco\lib\jquery-ui\jquery-ui.min.js" />
-    <Content Include="umbraco\lib\jquery\jquery-2.0.3.min.js" />
-    <Content Include="umbraco\lib\jquery\jquery-ui-1.10.3.custom.min.js" />
-    <Content Include="umbraco\lib\jquery\jquery-ui-1.10.4.custom.min.css" />
-    <Content Include="umbraco\lib\jquery\jquery-ui-1.10.4.custom.min.js" />
     <Content Include="umbraco\lib\jquery\jquery.min.js" />
-    <Content Include="umbraco\lib\jquery\jquery.sortable\jquery.sortable.min.js" />
-    <Content Include="umbraco\lib\jquery\jquery.ui.core.min.js" />
-    <Content Include="umbraco\lib\jquery\jquery.ui.draggable.js" />
-    <Content Include="umbraco\lib\jquery\jquery.ui.effect-highlight.min.js" />
-    <Content Include="umbraco\lib\jquery\jquery.ui.effect.min.js" />
-    <Content Include="umbraco\lib\jquery\jquery.ui.mouse.min.js" />
-    <Content Include="umbraco\lib\jquery\jquery.ui.sortable.min.js" />
-    <Content Include="umbraco\lib\jquery\jquery.ui.widget.min.js" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\cors\postmessage.html" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\cors\result.html" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\css\jquery.fileupload-ui.css" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\img\loading.gif" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\img\progressbar.gif" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\js\app.js" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\js\cors\jquery.postmessage-transport.js" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\js\cors\jquery.xdr-transport.js" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\js\jquery.fileupload-angular.js" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\js\jquery.fileupload-audio.js" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\js\jquery.fileupload-image.js" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\js\jquery.fileupload-jquery-ui.js" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\js\jquery.fileupload-process.js" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\js\jquery.fileupload-ui.js" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\js\jquery.fileupload-validate.js" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\js\jquery.fileupload-video.js" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\js\jquery.fileupload.js" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\js\jquery.iframe-transport.js" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\js\load-image.min.js" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\js\main.js" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\js\vendor\jquery.ui.widget.js" />
-    <Content Include="umbraco\lib\lazyload\lazyload.min.js" />
     <Content Include="umbraco\lib\less\less-1.7.0.min.js" />
     <Content Include="umbraco\lib\markdown\markdown.converter.js" />
     <Content Include="umbraco\lib\markdown\markdown.css" />
@@ -1182,10 +1137,8 @@
     <Content Include="umbraco\lib\slider\bootstrap-slider-custom.css" />
     <Content Include="umbraco\lib\slider\bootstrap-slider.css" />
     <Content Include="umbraco\lib\slider\js\bootstrap-slider.js" />
-    <Content Include="umbraco\lib\slider\slider.css" />
     <Content Include="umbraco\lib\spectrum\spectrum.css" />
     <Content Include="umbraco\lib\spectrum\spectrum.js" />
-    <Content Include="umbraco\lib\tinymce\license.txt" />
     <Content Include="umbraco\lib\tinymce\plugins\advlist\plugin.js" />
     <Content Include="umbraco\lib\tinymce\plugins\advlist\plugin.min.js" />
     <Content Include="umbraco\lib\tinymce\plugins\anchor\plugin.js" />
@@ -1369,20 +1322,6 @@
     <Content Include="umbraco\lib\tinymce\plugins\visualchars\plugin.min.js" />
     <Content Include="umbraco\lib\tinymce\plugins\wordcount\plugin.js" />
     <Content Include="umbraco\lib\tinymce\plugins\wordcount\plugin.min.js" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\content.inline.min.css" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\content.min.css" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\fonts\icomoon-small.svg" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\fonts\icomoon.svg" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\fonts\tinymce-small.svg" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\fonts\tinymce.svg" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\img\anchor.gif" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\img\loader.gif" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\img\object.gif" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\img\trans.gif" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\img\wline.gif" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\skin.classic.min.css" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\skin.ie7.min.css" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\skin.min.css" />
     <Content Include="umbraco\lib\tinymce\skins\umbraco\content.min.css" />
     <Content Include="umbraco\lib\tinymce\skins\umbraco\fonts\icomoon.svg" />
     <Content Include="umbraco\lib\tinymce\skins\umbraco\img\anchor.gif" />
@@ -1397,169 +1336,35 @@
     <Content Include="umbraco\lib\tinymce\themes\modern\theme.min.js" />
     <Content Include="umbraco\lib\tinymce\themes\umbraco\theme.min.js" />
     <Content Include="umbraco\lib\tinymce\tinymce.min.js" />
-    <Content Include="umbraco\lib\typeahead-js\typeahead.bundle.min.js" />
-    <Content Include="umbraco\lib\typeahead.js\typeahead.bundle.js" />
-    <Content Include="umbraco\lib\typeahead\typeahead.bundle.min.js" />
+    <Content Include="umbraco\lib\typeahead.js\typeahead.bundle.min.js" />
     <Content Include="umbraco\lib\umbraco\compat.js" />
     <Content Include="umbraco\lib\umbraco\Extensions.js" />
     <Content Include="umbraco\lib\umbraco\LegacySpeechBubble.js" />
     <Content Include="umbraco\lib\umbraco\LegacyUmbClientMgr.js" />
     <Content Include="umbraco\lib\umbraco\NamespaceManager.js" />
     <Content Include="umbraco\lib\underscore\underscore-min.js" />
-    <Content Include="umbraco\lib\underscore\underscore.js" />
     <Content Include="umbraco\masterpages\default.Master" />
     <Content Include="umbraco\masterpages\umbracoDialog.Master" />
     <Content Include="umbraco\masterpages\umbracoPage.Master" />
-    <Content Include="umbraco\plugins\umbracoContour\Analyzer.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\archiveForm.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\createForm.ascx" />
-    <Content Include="umbraco\plugins\umbracoContour\createFormFromDataSourceDialog.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\css\datatables.css" />
-    <Content Include="umbraco\plugins\umbracoContour\css\dd.css" />
-    <Content Include="umbraco\plugins\umbracoContour\css\dd_arrow.gif" />
-    <Content Include="umbraco\plugins\umbracoContour\css\defaultform.css" />
-    <Content Include="umbraco\plugins\umbracoContour\css\dialogs.css" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\add.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\add_grey.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\add_small.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\bullet_arrow_down.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\bullet_arrow_up.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\contextMenuBg.gif" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\copy_small.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\datasource_small.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\delete.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\delete_small.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\edit.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\edit_small.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\entries.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\options.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\remove_gray.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\ui-bg_flat_0_aaaaaa_40x100.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\ui-bg_flat_75_ffffff_40x100.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\ui-bg_glass_55_fbf9ee_1x400.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\ui-bg_glass_65_ffffff_1x400.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\ui-bg_glass_75_dadada_1x400.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\ui-bg_glass_75_e6e6e6_1x400.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\ui-bg_glass_95_fef1ec_1x400.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\ui-bg_highlight-soft_75_cccccc_1x100.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\ui-icons_222222_256x240.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\ui-icons_2e83ff_256x240.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\ui-icons_454545_256x240.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\ui-icons_888888_256x240.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\ui-icons_cd0a0a_256x240.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\workflow.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\img\x.png" />
-    <Content Include="umbraco\plugins\umbracoContour\css\jquery-ui-1.8.18.custom.css" />
-    <Content Include="umbraco\plugins\umbracoContour\css\style.css" />
-    <Content Include="umbraco\plugins\umbracoContour\css\TableTools.css" />
-    <Content Include="umbraco\plugins\umbracoContour\Designer.asmx" />
-    <Content Include="umbraco\plugins\umbracoContour\editDataSource.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\editForm.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\editFormEntries.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\editFormsSecurity.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\editFormWorkflows.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\editPrevalueProvider.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\editPrevalues.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\editPrevalueSource.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\editWorkflow.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\editWorkflowDialog.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\EntriesDashboard.ascx" />
-    <Content Include="umbraco\plugins\umbracoContour\executeRecordAction.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\exportForm.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\ExportFormEntries.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\exportFormEntriesDialog.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\FeedProxy.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\FileProxy.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\files\MVP.txt" />
-    <Content Include="umbraco\plugins\umbracoContour\files\MVPList.txt" />
-    <Content Include="umbraco\plugins\umbracoContour\files\MVPTest.txt" />
-    <Content Include="umbraco\plugins\umbracoContour\formPickerChooseFormDialog.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\formPickerCreateFormDialog.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\formPickerDialog.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\Forms.asmx" />
-    <Content Include="umbraco\plugins\umbracoContour\FormsDashboard.ascx" />
-    <Content Include="umbraco\plugins\umbracoContour\images\back.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\Calendar.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\down-arrow.gif" />
-    <Content Include="umbraco\plugins\umbracoContour\images\drag.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\fieldtypes\checkbox.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\fieldtypes\checkboxlist.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\fieldtypes\datepicker.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\fieldtypes\dropdownlist.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\fieldtypes\hiddenfield.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\fieldtypes\passwordfield.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\fieldtypes\radiobuttonlist.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\fieldtypes\textarea.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\fieldtypes\textfield.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\fieldtypes\upload.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\forward.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\icon_bug.gif" />
-    <Content Include="umbraco\plugins\umbracoContour\images\icon_export.gif" />
-    <Content Include="umbraco\plugins\umbracoContour\images\icon_field.gif" />
-    <Content Include="umbraco\plugins\umbracoContour\images\icon_fieldset.gif" />
-    <Content Include="umbraco\plugins\umbracoContour\images\icon_page.gif" />
-    <Content Include="umbraco\plugins\umbracoContour\images\icon_preview.gif" />
-    <Content Include="umbraco\plugins\umbracoContour\images\icon_settings.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\icon_workflow.gif" />
-    <Content Include="umbraco\plugins\umbracoContour\images\recordviewericons\approve.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\recordviewericons\copy.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\recordviewericons\copy_hover.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\recordviewericons\csv.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\recordviewericons\csv_hover.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\recordviewericons\delete.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\recordviewericons\edit.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\recordviewericons\email.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\recordviewericons\print.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\recordviewericons\print_hover.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\recordviewericons\xls.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\recordviewericons\xls_hover.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\sort_asc.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\sort_both.png" />
-    <Content Include="umbraco\plugins\umbracoContour\images\sort_dsc.png" />
-    <Content Include="umbraco\plugins\umbracoContour\importForm.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\previewFormDialog.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\previewFormDialogMvc.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\designsurface.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\Frontend\contourform.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\jquery-1.3.2.min.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\jquery-1.5.1.min.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\jquery-ui-1.7.2.custom.min.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\jquery-ui-1.8.11.min.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\jquery.datatables.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\jquery.dd.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\jquery.inlineedit.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\jquery.jeditable.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\jquery.jfeed.pack.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\jquery.simplemodal-1.2.3.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\jquery.validate.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\jquery.validate.min.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\jquery.validate.unobtrusive.min.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\TableTools.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\umbracoforms.designsurface.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\umbracoforms.documentmapper.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\umbracoforms.editformpage.eventhandlers.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\umbracoforms.eventhandlers.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\umbracoforms.fieldmapper.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\umbracoforms.formpickercreateformdialog.eventhandlers.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\umbracoforms.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\umbracoforms.limitedmode.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\umbracoforms.readonlymode.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\ZeroClipboard.js" />
-    <Content Include="umbraco\plugins\umbracoContour\scripts\ZeroClipboard.swf" />
-    <Content Include="umbraco\plugins\umbracoContour\test.asmx" />
-    <Content Include="umbraco\plugins\umbracoContour\tinymce\insertForm.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\Upgrade.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\Forms\Readme.txt" />
-    <Content Include="umbraco\plugins\umbracoContour\webservices\RecordActions.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\webservices\Records.aspx" />
-    <Content Include="umbraco\plugins\umbracoContour\Workflows.asmx" />
-    <Content Include="umbraco\plugins\umbracoContour\xslt\DataTables_json.xslt" />
-    <Content Include="umbraco\plugins\umbracoContour\xslt\DataTables_json_medtrust.xslt" />
-    <Content Include="umbraco\plugins\umbracoContour\xslt\excel.xslt" />
-    <Content Include="umbraco\plugins\umbracoContour\xslt\Html.xslt" />
-    <Content Include="umbraco\plugins\umbracoContour\xslt\postAsXmlSample.xslt" />
-    <Content Include="umbraco\plugins\umbracoContour\xslt\sendXsltEmailSample.xslt" />
-    <Content Include="umbraco\plugins\umbracoContour\xslt\xml.xslt" />
+    <Content Include="umbraco\plugins\ExamineDash\Actions.asmx" />
+    <Content Include="umbraco\plugins\FergusonMoriyama\Config\add.png" />
+    <Content Include="umbraco\plugins\FergusonMoriyama\Config\arrow_down.png" />
+    <Content Include="umbraco\plugins\FergusonMoriyama\Config\arrow_up.png" />
+    <Content Include="umbraco\plugins\FergusonMoriyama\Config\delete.png" />
+    <Content Include="umbraco\plugins\FergusonMoriyama\Config\script.js" />
+    <Content Include="umbraco\plugins\FergusonMoriyama\Config\styles.css" />
+    <Content Include="umbraco\plugins\FergusonMoriyama\feedcache\communityblogs.xml" />
+    <Content Include="umbraco\plugins\FergusonMoriyama\feedcache\Config.aspx" />
+    <Content Include="umbraco\plugins\FergusonMoriyama\feedcache\FeedCache.aspx" />
+    <Content Include="umbraco\plugins\FergusonMoriyama\feedcache\SaveConfig.aspx" />
+    <Content Include="umbraco\plugins\FergusonMoriyama\feedcache\twitterumbracosearch.xml" />
+    <Content Include="umbraco\plugins\Notifications\SheduledTaskTrigger.aspx" />
+    <Content Include="umbraco\plugins\tinymce3\InsertAnchor.aspx" />
+    <Content Include="umbraco\plugins\tinymce3\insertChar.aspx" />
+    <Content Include="umbraco\plugins\tinymce3\insertImage.aspx" />
+    <Content Include="umbraco\plugins\tinymce3\insertLink.aspx" />
+    <Content Include="umbraco\plugins\tinymce3\insertMacro.aspx" />
+    <Content Include="umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx" />
     <Content Include="umbraco\preview\editors\background.html" />
     <Content Include="umbraco\preview\editors\border.html" />
     <Content Include="umbraco\preview\editors\color.html" />
@@ -1591,12 +1396,88 @@
     <Content Include="umbraco\Views\common\dialogs\property.html" />
     <Content Include="umbraco\Views\common\dialogs\rteembed.html" />
     <Content Include="umbraco\Views\common\dialogs\template\querybuilder.html" />
+    <Content Include="umbraco\Views\common\dialogs\template\snippet.html" />
     <Content Include="umbraco\Views\common\dialogs\treepicker.html" />
     <Content Include="umbraco\Views\common\dialogs\user.html" />
     <Content Include="umbraco\Views\common\dialogs\ysod.html" />
     <Content Include="umbraco\Views\common\legacy.html" />
     <Content Include="umbraco\Views\common\login.html" />
     <Content Include="umbraco\Views\common\notifications\confirmroutechange.html" />
+    <Content Include="umbraco\Views\common\overlays\contentpicker\contentpicker.html" />
+    <Content Include="umbraco\Views\common\overlays\contenttypeeditor\compositions\compositions.html" />
+    <Content Include="umbraco\Views\common\overlays\contenttypeeditor\editorpicker\editorpicker.html" />
+    <Content Include="umbraco\Views\common\overlays\contenttypeeditor\editorsettings\editorsettings.html" />
+    <Content Include="umbraco\Views\common\overlays\contenttypeeditor\propertysettings\propertysettings.html" />
+    <Content Include="umbraco\Views\common\overlays\copy\copy.html" />
+    <Content Include="umbraco\Views\common\overlays\embed\embed.html" />
+    <Content Include="umbraco\Views\common\overlays\help\help.html" />
+    <Content Include="umbraco\Views\common\overlays\iconpicker\iconpicker.html" />
+    <Content Include="umbraco\Views\common\overlays\itempicker\itempicker.html" />
+    <Content Include="umbraco\Views\common\overlays\linkpicker\linkpicker.html" />
+    <Content Include="umbraco\Views\common\overlays\macropicker\macropicker.html" />
+    <Content Include="umbraco\Views\common\overlays\mediaPicker\mediapicker.html" />
+    <Content Include="umbraco\Views\common\overlays\membergrouppicker\membergrouppicker.html" />
+    <Content Include="umbraco\Views\common\overlays\memberpicker\memberpicker.html" />
+    <Content Include="umbraco\Views\common\overlays\move\move.html" />
+    <Content Include="umbraco\Views\common\overlays\treepicker\treepicker.html" />
+    <Content Include="umbraco\Views\common\overlays\user\user.html" />
+    <Content Include="umbraco\Views\common\overlays\ysod\ysod.html" />
+    <Content Include="umbraco\Views\components\application\umb-contextmenu.html" />
+    <Content Include="umbraco\Views\components\application\umb-navigation.html" />
+    <Content Include="umbraco\Views\components\application\umb-sections.html" />
+    <Content Include="umbraco\Views\components\buttons\umb-button-group.html" />
+    <Content Include="umbraco\Views\components\buttons\umb-button.html" />
+    <Content Include="umbraco\Views\components\editor\subheader\umb-editor-sub-header-content-left.html" />
+    <Content Include="umbraco\Views\components\editor\subheader\umb-editor-sub-header-content-right.html" />
+    <Content Include="umbraco\Views\components\editor\subheader\umb-editor-sub-header-section.html" />
+    <Content Include="umbraco\Views\components\editor\subheader\umb-editor-sub-header.html" />
+    <Content Include="umbraco\Views\components\editor\umb-breadcrumbs.html" />
+    <Content Include="umbraco\Views\components\editor\umb-editor-container.html" />
+    <Content Include="umbraco\Views\components\editor\umb-editor-footer-content-left.html" />
+    <Content Include="umbraco\Views\components\editor\umb-editor-footer-content-right.html" />
+    <Content Include="umbraco\Views\components\editor\umb-editor-footer.html" />
+    <Content Include="umbraco\Views\components\editor\umb-editor-header.html" />
+    <Content Include="umbraco\Views\components\editor\umb-editor-menu.html" />
+    <Content Include="umbraco\Views\components\editor\umb-editor-navigation.html" />
+    <Content Include="umbraco\Views\components\editor\umb-editor-sub-views.html" />
+    <Content Include="umbraco\Views\components\editor\umb-editor-view.html" />
+    <Content Include="umbraco\Views\components\html\umb-control-group.html" />
+    <Content Include="umbraco\Views\components\html\umb-pane.html" />
+    <Content Include="umbraco\Views\components\html\umb-panel.html" />
+    <Content Include="umbraco\Views\components\imaging\umb-image-crop.html" />
+    <Content Include="umbraco\Views\components\imaging\umb-image-gravity.html" />
+    <Content Include="umbraco\Views\components\imaging\umb-image-thumbnail.html" />
+    <Content Include="umbraco\Views\components\notifications\umb-notifications.html" />
+    <Content Include="umbraco\Views\components\overlays\umb-overlay-backdrop.html" />
+    <Content Include="umbraco\Views\components\overlays\umb-overlay.html" />
+    <Content Include="umbraco\Views\components\property\umb-property-editor.html" />
+    <Content Include="umbraco\Views\components\property\umb-property-group.html" />
+    <Content Include="umbraco\Views\components\property\umb-property.html" />
+    <Content Include="umbraco\Views\components\tabs\umb-tab.html" />
+    <Content Include="umbraco\Views\components\tabs\umb-tabs-content.html" />
+    <Content Include="umbraco\Views\components\tabs\umb-tabs-nav.html" />
+    <Content Include="umbraco\Views\components\tree\umb-tree-search-box.html" />
+    <Content Include="umbraco\Views\components\tree\umb-tree-search-results.html" />
+    <Content Include="umbraco\Views\components\umb-child-selector.html" />
+    <Content Include="umbraco\Views\components\umb-confirm-action.html" />
+    <Content Include="umbraco\Views\components\umb-confirm.html" />
+    <Content Include="umbraco\Views\components\umb-content-grid.html" />
+    <Content Include="umbraco\Views\components\umb-empty-state.html" />
+    <Content Include="umbraco\Views\components\umb-folder-grid.html" />
+    <Content Include="umbraco\Views\components\umb-generate-alias.html" />
+    <Content Include="umbraco\Views\components\umb-grid-selector.html" />
+    <Content Include="umbraco\Views\components\umb-groups-builder.html" />
+    <Content Include="umbraco\Views\components\umb-keyboard-shortcuts-overview.html" />
+    <Content Include="umbraco\Views\components\umb-layout-selector.html" />
+    <Content Include="umbraco\Views\components\umb-list-view-layout.html" />
+    <Content Include="umbraco\Views\components\umb-list-view-settings.html" />
+    <Content Include="umbraco\Views\components\umb-load-indicator.html" />
+    <Content Include="umbraco\Views\components\umb-locked-field.html" />
+    <Content Include="umbraco\Views\components\umb-media-grid.html" />
+    <Content Include="umbraco\Views\components\umb-pagination.html" />
+    <Content Include="umbraco\Views\components\umb-table.html" />
+    <Content Include="umbraco\Views\components\umb-tooltip.html" />
+    <Content Include="umbraco\Views\components\upload\umb-file-dropzone.html" />
     <Content Include="umbraco\Views\content\copy.html" />
     <Content Include="umbraco\Views\content\create.html" />
     <Content Include="umbraco\Views\content\delete.html" />
@@ -1626,6 +1507,20 @@
     <Content Include="umbraco\Views\dashboard\members\membersdashboardvideos.html" />
     <Content Include="umbraco\Views\dashboard\settings\settingsdashboardintro.html" />
     <Content Include="umbraco\Views\dashboard\settings\settingsdashboardvideos.html" />
+    <Content Include="umbraco\Views\datatypes\create.html" />
+    <Content Include="umbraco\Views\datatypes\delete.html" />
+    <Content Include="umbraco\Views\datatypes\edit.html" />
+    <Content Include="umbraco\Views\datatypes\move.html" />
+    <Content Include="umbraco\Views\documenttypes\create.html" />
+    <Content Include="umbraco\Views\documenttypes\delete.html" />
+    <Content Include="umbraco\Views\documenttypes\edit.html" />
+    <Content Include="umbraco\Views\documenttypes\move.html" />
+    <Content Include="umbraco\Views\documenttypes\property.html" />
+    <Content Include="umbraco\Views\documenttypes\propertygroup.html" />
+    <Content Include="umbraco\Views\documenttypes\views\design\design.html" />
+    <Content Include="umbraco\Views\documenttypes\views\listview\listview.html" />
+    <Content Include="umbraco\Views\documenttypes\views\permissions\permissions.html" />
+    <Content Include="umbraco\Views\documenttypes\views\templates\templates.html" />
     <Content Include="umbraco\Views\install\continueinstall.html" />
     <Content Include="umbraco\Views\install\database.html" />
     <Content Include="umbraco\Views\install\error.html" />
@@ -1634,17 +1529,30 @@
     <Content Include="umbraco\Views\install\upgrade.html" />
     <Content Include="umbraco\Views\install\user.html" />
     <Content Include="umbraco\Views\install\version7upgradereport.html" />
+    <Content Include="umbraco\Views\mediatypes\create.html" />
+    <Content Include="umbraco\Views\mediatypes\delete.html" />
+    <Content Include="umbraco\Views\mediatypes\edit.html" />
+    <Content Include="umbraco\Views\mediatypes\move.html" />
+    <Content Include="umbraco\Views\mediatypes\views\design\design.html" />
+    <Content Include="umbraco\Views\mediatypes\views\listview\listview.html" />
+    <Content Include="umbraco\Views\mediatypes\views\permissions\permissions.html" />
     <Content Include="umbraco\Views\media\create.html" />
     <Content Include="umbraco\Views\media\delete.html" />
     <Content Include="umbraco\Views\media\edit.html" />
     <Content Include="umbraco\Views\media\emptyrecyclebin.html" />
     <Content Include="umbraco\Views\media\move.html" />
     <Content Include="umbraco\Views\media\recyclebin.html" />
+    <Content Include="umbraco\Views\membertypes\create.html" />
+    <Content Include="umbraco\Views\membertypes\delete.html" />
+    <Content Include="umbraco\Views\membertypes\edit.html" />
+    <Content Include="umbraco\Views\membertypes\move.html" />
+    <Content Include="umbraco\Views\membertypes\views\design\design.html" />
     <Content Include="umbraco\Views\member\create.html" />
     <Content Include="umbraco\Views\member\delete.html" />
     <Content Include="umbraco\Views\member\edit.html" />
     <Content Include="umbraco\Views\member\list.html" />
     <Content Include="umbraco\Views\prevalueeditors\boolean.html" />
+    <Content Include="umbraco\Views\prevalueeditors\decimal.html" />
     <Content Include="umbraco\Views\prevalueeditors\hidden.html" />
     <Content Include="umbraco\Views\prevalueeditors\imagepicker.html" />
     <Content Include="umbraco\Views\prevalueeditors\mediapicker.html" />
@@ -1665,6 +1573,7 @@
     <Content Include="umbraco\Views\propertyeditors\colorpicker\colorpicker.prevalues.html" />
     <Content Include="umbraco\Views\propertyeditors\contentpicker\contentpicker.html" />
     <Content Include="umbraco\Views\propertyeditors\datepicker\datepicker.html" />
+    <Content Include="umbraco\Views\propertyeditors\decimal\decimal.html" />
     <Content Include="umbraco\Views\propertyeditors\dropdown\dropdown.html" />
     <Content Include="umbraco\Views\propertyeditors\email\email.html" />
     <Content Include="umbraco\Views\propertyeditors\entitypicker\entitypicker.html" />
@@ -1689,7 +1598,11 @@
     <Content Include="umbraco\Views\propertyeditors\imagecropper\imagecropper.html" />
     <Content Include="umbraco\Views\propertyeditors\imagecropper\imagecropper.prevalues.html" />
     <Content Include="umbraco\Views\propertyeditors\integer\integer.html" />
+    <Content Include="umbraco\Views\propertyeditors\listview\bulkActionPermissions.prevalues.html" />
     <Content Include="umbraco\Views\propertyeditors\listview\includeproperties.prevalues.html" />
+    <Content Include="umbraco\Views\propertyeditors\listview\layouts.prevalues.html" />
+    <Content Include="umbraco\Views\propertyeditors\listview\layouts\grid\grid.html" />
+    <Content Include="umbraco\Views\propertyeditors\listview\layouts\list\list.html" />
     <Content Include="umbraco\Views\propertyeditors\listview\listview.html" />
     <Content Include="umbraco\Views\propertyeditors\listview\orderDirection.prevalues.html" />
     <Content Include="umbraco\Views\propertyeditors\listview\sortby.prevalues.html" />
@@ -1706,8 +1619,10 @@
     <Content Include="umbraco\Views\propertyeditors\relatedlinks\relatedlinks.html" />
     <Content Include="umbraco\Views\propertyeditors\rte\rte.html" />
     <Content Include="umbraco\Views\propertyeditors\rte\rte.prevalues.html" />
+    <Content Include="umbraco\Views\propertyeditors\slider\handle.prevalues.html" />
     <Content Include="umbraco\Views\propertyeditors\slider\orientation.prevalues.html" />
     <Content Include="umbraco\Views\propertyeditors\slider\slider.html" />
+    <Content Include="umbraco\Views\propertyeditors\slider\tooltip.prevalues.html" />
     <Content Include="umbraco\Views\propertyeditors\tags\tags.html" />
     <Content Include="umbraco\Views\propertyeditors\tags\tags.prevalues.html" />
     <Content Include="umbraco\Views\propertyeditors\templatepicker\templatepicker.html" />
@@ -2721,7 +2636,6 @@
     <Content Include="umbraco\config\lang\ja.xml" />
     <Content Include="umbraco\config\lang\ko.xml" />
     <Content Include="umbraco\config\lang\nl.xml" />
-    <Content Include="umbraco\config\lang\no.xml" />
     <Content Include="umbraco\config\lang\pl.xml" />
     <Content Include="umbraco\config\lang\pt.xml" />
     <Content Include="umbraco\config\lang\ru.xml" />
@@ -2740,7 +2654,6 @@
     <Content Include="umbraco\create\content.ascx" />
     <Content Include="umbraco\create\DLRScripting.ascx" />
     <Content Include="umbraco\create\language.ascx" />
-    <Content Include="umbraco\create\media.ascx" />
     <Content Include="umbraco\create\member.ascx" />
     <Content Include="umbraco\create\nodeType.ascx" />
     <Content Include="umbraco\create\script.ascx" />
@@ -3162,7 +3075,6 @@
     <Content Include="umbraco\js\dualSelectBox.js" />
     <Content Include="umbraco\js\guiFunctions.js" />
     <Content Include="umbraco\js\language.aspx" />
-    <Content Include="umbraco\js\UmbracoCasingRules.aspx" />
     <Content Include="umbraco\js\umbracoCheckKeys.js" />
     <Content Include="umbraco\js\UmbracoSpeechBubble.js" />
     <Content Include="umbraco\js\UmbracoSpeechBubbleBackEnd.js" />
@@ -3170,60 +3082,12 @@
     <Content Include="umbraco\js\umbracoUpgradeChecker.js" />
     <Content Include="umbraco\js\xmlextras.js" />
     <Content Include="umbraco\js\xmlRequest.js" />
-    <Content Include="umbraco\LiveEditing\Controls\Communicator.js" />
-    <Content Include="umbraco\LiveEditing\Controls\LiveEditingToolbar.js" />
-    <Content Include="umbraco\LiveEditing\Css\LiveEditing.css" />
-    <Content Include="umbraco\LiveEditing\Images\canvas.gif" />
-    <Content Include="umbraco\LiveEditing\Images\dialog_background.png" />
-    <Content Include="umbraco\LiveEditing\Modules\CreateModule\create.png" />
-    <Content Include="umbraco\LiveEditing\Modules\CreateModule\CreateModule.js" />
-    <Content Include="umbraco\LiveEditing\Modules\DeleteModule\delete.png" />
-    <Content Include="umbraco\LiveEditing\Modules\DeleteModule\DeleteModule.js" />
-    <Content Include="umbraco\LiveEditing\Modules\ItemEditing\ItemEditing.js" />
-    <Content Include="umbraco\LiveEditing\Modules\ItemEditing\ItemEditingInvoke.js" />
-    <Content Include="umbraco\LiveEditing\Modules\MacroModule\MacroModule.js" />
-    <Content Include="umbraco\LiveEditing\Modules\SkinModule\CssParser.aspx" />
-    <Content Include="umbraco\LiveEditing\Modules\SkinModule\images\loader.gif" />
-    <Content Include="umbraco\LiveEditing\Modules\SkinModule\images\module.gif" />
-    <Content Include="umbraco\LiveEditing\Modules\SkinModule\images\skin.gif" />
-    <Content Include="umbraco\LiveEditing\Modules\SkinModule\ImageUploader.aspx" />
-    <Content Include="umbraco\LiveEditing\Modules\SkinModule\js\disableInstallButtonsOnClick.js" />
-    <Content Include="umbraco\LiveEditing\Modules\SkinModule\js\initcolorpicker.js" />
-    <Content Include="umbraco\LiveEditing\Modules\SkinModule\js\initslider.js" />
-    <Content Include="umbraco\LiveEditing\Modules\SkinModule\js\ModuleInjection.js" />
-    <Content Include="umbraco\LiveEditing\Modules\SkinModule\js\SkinModuleShowOnStartup.js" />
-    <Content Include="umbraco\LiveEditing\Modules\SkinModule\ModuleInjectionMacroRenderer.aspx" />
-    <Content Include="umbraco\LiveEditing\Modules\SkinModule\ModuleInjector.aspx" />
-    <Content Include="umbraco\LiveEditing\Modules\SkinModule\ModuleInstaller.aspx" />
-    <Content Include="umbraco\LiveEditing\Modules\SkinModule\ModuleSelector.ascx" />
-    <Content Include="umbraco\LiveEditing\Modules\SkinModule\SkinCustomizer.ascx" />
-    <Content Include="umbraco\LiveEditing\Modules\UnpublishModule\unpublish.png" />
-    <Content Include="umbraco\LiveEditing\Modules\UnpublishModule\UnpublishModule.js" />
     <Content Include="umbraco\logout.aspx" />
     <Content Include="umbraco\macroResultWrapper.aspx" />
     <Content Include="umbraco\members\EditMemberGroup.aspx" />
     <Content Include="umbraco\members\MemberSearch.ascx" />
     <Content Include="umbraco\members\search.aspx" />
     <Content Include="umbraco\members\ViewMembers.aspx" />
-    <Content Include="umbraco\plugins\ExamineDash\Actions.asmx" />
-    <Content Include="umbraco\plugins\FergusonMoriyama\Config\add.png" />
-    <Content Include="umbraco\plugins\FergusonMoriyama\Config\arrow_down.png" />
-    <Content Include="umbraco\plugins\FergusonMoriyama\Config\arrow_up.png" />
-    <Content Include="umbraco\plugins\FergusonMoriyama\Config\delete.png" />
-    <Content Include="umbraco\plugins\FergusonMoriyama\Config\script.js" />
-    <Content Include="umbraco\plugins\FergusonMoriyama\Config\styles.css" />
-    <Content Include="umbraco\plugins\FergusonMoriyama\feedcache\communityblogs.xml" />
-    <Content Include="umbraco\plugins\FergusonMoriyama\feedcache\Config.aspx" />
-    <Content Include="umbraco\plugins\FergusonMoriyama\feedcache\FeedCache.aspx" />
-    <Content Include="umbraco\plugins\FergusonMoriyama\feedcache\SaveConfig.aspx" />
-    <Content Include="umbraco\plugins\FergusonMoriyama\feedcache\twitterumbracosearch.xml" />
-    <Content Include="umbraco\plugins\Notifications\SheduledTaskTrigger.aspx" />
-    <Content Include="umbraco\plugins\tinymce3\InsertAnchor.aspx" />
-    <Content Include="umbraco\plugins\tinymce3\insertChar.aspx" />
-    <Content Include="umbraco\plugins\tinymce3\insertImage.aspx" />
-    <Content Include="umbraco\plugins\tinymce3\insertLink.aspx" />
-    <Content Include="umbraco\plugins\tinymce3\insertMacro.aspx" />
-    <Content Include="umbraco\plugins\tinymce3\tinymce3tinymceCompress.aspx" />
     <Content Include="umbraco\publishStatus.aspx" />
     <Content Include="umbraco\Search\QuickSearch.ascx" />
     <Content Include="umbraco\Search\quickSearch.js" />
@@ -4393,28 +4257,6 @@
     <Content Include="projects\umbraco-pro\contour\Documentation\Installation\troubleshoot.md" />
     <Content Include="projects\umbraco-pro\contour\Documentation\Installation\upgrade.md" />
     <Content Include="projects\umbraco-pro\contour\Documentation\readme.md" />
-    <Content Include="umbraco\plugins\umbracoContour\files\mvp2013" />
-    <Content Include="umbraco\plugins\umbracoContour\templates\Comment form.ucf" />
-    <Content Include="umbraco\plugins\umbracoContour\templates\Contact form.ucf" />
-    <Content Include="umbraco\plugins\umbracoContour\UmbracoContour.config" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\Comment form.ucf" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\Contact form.ucf" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\ContourForm.cshtml" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\FieldType.CheckBox.cshtml" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\FieldType.CheckBoxList.cshtml" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\FieldType.DatePicker.cshtml" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\FieldType.DropDownList.cshtml" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\FieldType.FileUpload.cshtml" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\FieldType.HiddenField.cshtml" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\FieldType.Password.cshtml" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\FieldType.PasswordField.cshtml" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\FieldType.RadioButtonList.cshtml" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\FieldType.Textarea.cshtml" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\FieldType.Textfield.cshtml" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\Form.cshtml" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\Script.cshtml" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\Web.config" />
-    <Content Include="umbraco\plugins\umbracoContour\Views\_ViewStart.cshtml" />
     <Content Include="macroScripts\Rss-CommunityBlogs.cshtml" />
     <Content Include="macroScripts\TwitterSearch.cshtml" />
     <Content Include="masterpages\SwitchForumEditor.master" />
@@ -4491,21 +4333,6 @@
     <Content Include="umbraco\lib\bootstrap\less\utilities.less" />
     <Content Include="umbraco\lib\bootstrap\less\variables.less" />
     <Content Include="umbraco\lib\bootstrap\less\wells.less" />
-    <Content Include="umbraco\lib\jquery\jquery.upload\README.md" />
-    <Content Include="umbraco\lib\tinymce\langs\readme.md" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\fonts\icomoon-small.eot" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\fonts\icomoon-small.ttf" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\fonts\icomoon-small.woff" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\fonts\icomoon.eot" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\fonts\icomoon.ttf" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\fonts\icomoon.woff" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\fonts\readme.md" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\fonts\tinymce-small.eot" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\fonts\tinymce-small.ttf" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\fonts\tinymce-small.woff" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\fonts\tinymce.eot" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\fonts\tinymce.ttf" />
-    <Content Include="umbraco\lib\tinymce\skins\lightgray\fonts\tinymce.woff" />
     <Content Include="umbraco\lib\tinymce\skins\umbraco\fonts\icomoon.eot" />
     <Content Include="umbraco\lib\tinymce\skins\umbraco\fonts\icomoon.ttf" />
     <Content Include="umbraco\lib\tinymce\skins\umbraco\fonts\icomoon.woff" />
@@ -4590,10 +4417,7 @@
   <ItemGroup>
     <Folder Include="App_Data\migrations\" />
     <Folder Include="css\img\Cached\" />
-    <Folder Include="umbraco\dashboard\air\" />
-    <Folder Include="umbraco\dashboard\swfs\" />
-    <Folder Include="umbraco\plugins\Terabyte\" />
-    <Folder Include="umbraco\plugins\uComponents\" />
+    <Folder Include="umbraco\lib\datetimepicker\langs\" />
     <Folder Include="umbraco\Views\directives\" />
     <Folder Include="usercontrols\Deli\Admin\" />
   </ItemGroup>