Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

Conflicts:
	MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

2 files changed, 3 insertions, 2 deletions

diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index 9b97c1e98f..e45f524192 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -470,6 +470,7 @@ namespace MediaBrowser.WebDashboard.Api
                                 "notificationlist.js",
                                 "notificationsetting.js",
                                 "notificationsettings.js",
+                                "photos.js",
                                 "playlists.js",
                                 "playlistedit.js",
 
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index b0379de5cf..5c4aab1e4f 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -132,7 +132,7 @@
     <Content Include="dashboard-ui\mysyncjob.html">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\ReportManager.html">

+    <Content Include="dashboard-ui\photos.html">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

     <Content Include="dashboard-ui\scripts\dashboardhosting.js">

@@ -150,7 +150,7 @@
     <Content Include="dashboard-ui\scripts\livetvitems.js">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\scripts\reportmanager.js">

+    <Content Include="dashboard-ui\scripts\photos.js">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

     <Content Include="dashboard-ui\scripts\selectserver.js">