Resolve conflicts

Author: diluculo

src/Gemini/Gemini.csproj

@@ -31,11 +31,12 @@
     </Compile>
     <DesignData Include="Modules\Settings\SampleData\SettingsViewModelSampleData.xaml" />
     <Resource Include="Framework\ShaderEffects\GrayscaleEffect.ps" />
+    <Resource Include="Framework\ShaderEffects\ThemedImageEffect.ps" />
     <None Update="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <Resource Include="Resources\Icons\*.png" />
+    <Resource Include="Resources\Icons\*.png" />    
     <EmbeddedResource Update="Properties\Resources.de.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.de.Designer.cs</LastGenOutput>

src/Gemini/Themes/VS2013/Controls/Menu.xaml

@@ -151,17 +151,6 @@
                         Background="Transparent"
                         Padding="2,0,1,0">
                     <Grid>
-                        <ContentPresenter x:Name="Icon"
-                                          HorizontalAlignment="Center" 
-                                          VerticalAlignment="Center"
-                                          Height="16" Width="16"
-                                          ContentSource="Icon">
-                            <ContentPresenter.Effect>
-                                <shaderEffects:ThemedImageEffect Background="{Binding Converter={StaticResource SolidColorBrushToColorConverter}, Mode=OneWay,
-                                                                                      Source={StaticResource DefaultBackground}, Path=Data}"
-                                                                 IsEnabled="{Binding Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}, Path=IsEnabled}"/>
-                            </ContentPresenter.Effect>
-                        </ContentPresenter>
                         <Border x:Name="Check" 
                                 VerticalAlignment="Center" HorizontalAlignment="Center" 
                                 Width="16" Height="16"
@@ -178,7 +167,13 @@
                                               HorizontalAlignment="Center" 
                                               VerticalAlignment="Center"
                                               Height="16" Width="16"
-                                              ContentSource="Icon" />
+                                              ContentSource="Icon">
+                                <ContentPresenter.Effect>
+                                    <shaderEffects:ThemedImageEffect Background="{Binding Converter={StaticResource SolidColorBrushToColorConverter}, Mode=OneWay,
+                                                                                      Source={StaticResource DefaultBackground}, Path=Data}"
+                                                                 IsEnabled="{Binding Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}, Path=IsEnabled}"/>
+                                </ContentPresenter.Effect>
+                            </ContentPresenter>
                         </Border>
                     </Grid>
                 </Border>