diff --git a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml
index 26376530..273a438c 100644
--- a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml
+++ b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Deployment xmlns="http://schemas.microsoft.com/windowsphone/2012/deployment" AppPlatformVersion="8.0">
-  <DefaultLanguage xmlns="" code="de-DE" />
-  <App xmlns="" ProductID="{120b88cc-f3f0-4c5a-a3fd-c26e835338cc}" Title="CampusAppWP8" RuntimeType="Silverlight" Version="1.0.0.0" Genre="apps.normal" Author="CampusAppWP8 author" Description="Die BTU-CampusApp für WP8" Publisher="CampusAppWP8" PublisherID="{3511cc48-91b0-4ffb-9023-b69a81021a46}">
-    <IconPath IsRelative="true" IsResource="false">Assets\ApplicationIcon.png</IconPath>
-    <Capabilities>
-      <Capability Name="ID_CAP_NETWORKING" />
-      <Capability Name="ID_CAP_SENSORS" />
-      <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
-      <Capability Name="ID_CAP_PROXIMITY" />
-      <Capability Name="ID_CAP_MAP" />
-      <Capability Name="ID_CAP_LOCATION" />
-      <Capability Name="ID_CAP_ISV_CAMERA" />
-    </Capabilities>
-    <Tasks>
-      <DefaultTask Name="_default" NavigationPage="pages/news/NewsPage.xaml" />
-    </Tasks>
-    <Tokens>
-      <PrimaryToken TokenID="CampusAppWP8Token" TaskName="_default">
-        <TemplateFlip>
-          <SmallImageURI IsRelative="true" IsResource="false">Assets\Tiles\FlipCycleTileSmall.png</SmallImageURI>
-          <Count>0</Count>
-          <BackgroundImageURI IsRelative="true" IsResource="false">Assets\Tiles\FlipCycleTileMedium.png</BackgroundImageURI>
-          <Title>CampusAppWP8</Title>
-          <BackContent>
-          </BackContent>
-          <BackBackgroundImageURI>
-          </BackBackgroundImageURI>
-          <BackTitle>
-          </BackTitle>
-          <DeviceLockImageURI>
-          </DeviceLockImageURI>
-          <HasLarge>
-          </HasLarge>
-        </TemplateFlip>
-      </PrimaryToken>
-    </Tokens>
-    <ScreenResolutions>
-      <ScreenResolution Name="ID_RESOLUTION_WVGA" />
-      <ScreenResolution Name="ID_RESOLUTION_WXGA" />
-      <ScreenResolution Name="ID_RESOLUTION_HD720P" />
-    </ScreenResolutions>
-  </App>
+<?xml version="1.0" encoding="utf-8"?>
+<Deployment xmlns="http://schemas.microsoft.com/windowsphone/2012/deployment" AppPlatformVersion="8.0">
+  <DefaultLanguage xmlns="" code="de-DE" />
+  <App xmlns="" ProductID="{120b88cc-f3f0-4c5a-a3fd-c26e835338cc}" Title="CampusAppWP8" RuntimeType="Silverlight" Version="1.0.0.0" Genre="apps.normal" Author="CampusAppWP8 author" Description="Die BTU-CampusApp für WP8" Publisher="CampusAppWP8" PublisherID="{3511cc48-91b0-4ffb-9023-b69a81021a46}">
+    <IconPath IsRelative="true" IsResource="false">Assets\ApplicationIcon.png</IconPath>
+    <Capabilities>
+      <Capability Name="ID_CAP_NETWORKING" />
+      <Capability Name="ID_CAP_SENSORS" />
+      <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
+      <Capability Name="ID_CAP_PROXIMITY" />
+      <Capability Name="ID_CAP_MAP" />
+      <Capability Name="ID_CAP_LOCATION" />
+      <Capability Name="ID_CAP_ISV_CAMERA" />
+    </Capabilities>
+    <Tasks>
+      <DefaultTask Name="_default" NavigationPage="pages/news/NewsPage.xaml" />
+    </Tasks>
+    <Tokens>
+      <PrimaryToken TokenID="CampusAppWP8Token" TaskName="_default">
+        <TemplateFlip>
+          <SmallImageURI IsRelative="true" IsResource="false">Assets\Tiles\FlipCycleTileSmall.png</SmallImageURI>
+          <Count>0</Count>
+          <BackgroundImageURI IsRelative="true" IsResource="false">Assets\Tiles\FlipCycleTileMedium.png</BackgroundImageURI>
+          <Title>CampusAppWP8</Title>
+          <BackContent>
+          </BackContent>
+          <BackBackgroundImageURI>
+          </BackBackgroundImageURI>
+          <BackTitle>
+          </BackTitle>
+          <DeviceLockImageURI>
+          </DeviceLockImageURI>
+          <HasLarge>
+          </HasLarge>
+        </TemplateFlip>
+      </PrimaryToken>
+    </Tokens>
+    <ScreenResolutions>
+      <ScreenResolution Name="ID_RESOLUTION_WVGA" />
+      <ScreenResolution Name="ID_RESOLUTION_WXGA" />
+      <ScreenResolution Name="ID_RESOLUTION_HD720P" />
+    </ScreenResolutions>
+  </App>
 </Deployment>
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/README_FIRST.txt b/CampusAppWP8/CampusAppWP8/README_FIRST.txt
index d1bb14e8..ce40c013 100644
--- a/CampusAppWP8/CampusAppWP8/README_FIRST.txt
+++ b/CampusAppWP8/CampusAppWP8/README_FIRST.txt
@@ -1,3 +1,3 @@
-For the Windows Phone toolkit make sure that you have
-marked the icons in the "Toolkit.Content" folder as content.  That way they 
+For the Windows Phone toolkit make sure that you have
+marked the icons in the "Toolkit.Content" folder as content.  That way they 
 can be used as the icons for the ApplicationBar control.
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
index bdfffb45..3b8be1af 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
@@ -250,3 +251,248 @@ namespace CampusAppWP8.Resources {
         }
     }
 }
+=======
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.18046
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CampusAppWP8.Resources {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class AppResources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal AppResources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CampusAppWP8.Resources.AppResources", typeof(AppResources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Hinzufügen ähnelt.
+        /// </summary>
+        public static string AppBarButtonText {
+            get {
+                return ResourceManager.GetString("AppBarButtonText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Menübefehl ähnelt.
+        /// </summary>
+        public static string AppBarMenuItemText {
+            get {
+                return ResourceManager.GetString("AppBarMenuItemText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die BTU CampusApp ähnelt.
+        /// </summary>
+        public static string ApplicationTitle {
+            get {
+                return ResourceManager.GetString("ApplicationTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Campusplan ähnelt.
+        /// </summary>
+        public static string CampusMapApp_Title {
+            get {
+                return ResourceManager.GetString("CampusMapApp_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Lehrstühle ähnelt.
+        /// </summary>
+        public static string DepartmentApp_Title {
+            get {
+                return ResourceManager.GetString("DepartmentApp_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Events ähnelt.
+        /// </summary>
+        public static string EventApp_Title {
+            get {
+                return ResourceManager.GetString("EventApp_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Hausaufgaben ähnelt.
+        /// </summary>
+        public static string HomeworkApp_Title {
+            get {
+                return ResourceManager.GetString("HomeworkApp_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Vorlesung ähnelt.
+        /// </summary>
+        public static string LectureApp_Title {
+            get {
+                return ResourceManager.GetString("LectureApp_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Links ähnelt.
+        /// </summary>
+        public static string LinkApp_Title {
+            get {
+                return ResourceManager.GetString("LinkApp_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Webmail ähnelt.
+        /// </summary>
+        public static string MailApp_Title {
+            get {
+                return ResourceManager.GetString("MailApp_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Mensaplan ähnelt.
+        /// </summary>
+        public static string MensaApp_Title {
+            get {
+                return ResourceManager.GetString("MensaApp_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die News ähnelt.
+        /// </summary>
+        public static string NewsApp_Title {
+            get {
+                return ResourceManager.GetString("NewsApp_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die zur Übersicht ähnelt.
+        /// </summary>
+        public static string NewsHomeBtn {
+            get {
+                return ResourceManager.GetString("NewsHomeBtn", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Öffnungszeiten ähnelt.
+        /// </summary>
+        public static string OpenHoursApp_Title {
+            get {
+                return ResourceManager.GetString("OpenHoursApp_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Fachschaften ähnelt.
+        /// </summary>
+        public static string OSAApp_Title {
+            get {
+                return ResourceManager.GetString("OSAApp_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die LeftToRight ähnelt.
+        /// </summary>
+        public static string ResourceFlowDirection {
+            get {
+                return ResourceManager.GetString("ResourceFlowDirection", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die de-de ähnelt.
+        /// </summary>
+        public static string ResourceLanguage {
+            get {
+                return ResourceManager.GetString("ResourceLanguage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Beispielwert für die Laufzeiteigenschaft ähnelt.
+        /// </summary>
+        public static string SampleProperty {
+            get {
+                return ResourceManager.GetString("SampleProperty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Stundenplan ähnelt.
+        /// </summary>
+        public static string TimeTableApp_Title {
+            get {
+                return ResourceManager.GetString("TimeTableApp_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Willkommen zur BTU-CampusApp WP8 ähnelt.
+        /// </summary>
+        public static string WelcomeString {
+            get {
+                return ResourceManager.GetString("WelcomeString", resourceCulture);
+            }
+        }
+    }
+}
+>>>>>>> d70e3da558c01e1f589ef06e919074b36a45d32c
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
index 6ddf5ac3..18ebd2da 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
@@ -182,4 +183,187 @@
   <data name="NewsLinkBtn" xml:space="preserve">
     <value>Link</value>
   </data>
+=======
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ResourceFlowDirection" xml:space="preserve">
+    <value>LeftToRight</value>
+    <comment>Controls the FlowDirection for all elements in the RootFrame. Set to the traditional direction of this resource file's language</comment>
+  </data>
+  <data name="ResourceLanguage" xml:space="preserve">
+    <value>de-de</value>
+    <comment>Controls the Language and ensures that the font for all elements in the RootFrame aligns with the app's language. Set to the language code of this resource file's language.</comment>
+  </data>
+  <data name="ApplicationTitle" xml:space="preserve">
+    <value>BTU CampusApp</value>
+  </data>
+  <data name="SampleProperty" xml:space="preserve">
+    <value>Beispielwert für die Laufzeiteigenschaft</value>
+  </data>
+  <data name="AppBarButtonText" xml:space="preserve">
+    <value>Hinzufügen</value>
+  </data>
+  <data name="AppBarMenuItemText" xml:space="preserve">
+    <value>Menübefehl</value>
+  </data>
+  <data name="WelcomeString" xml:space="preserve">
+    <value>Willkommen zur BTU-CampusApp WP8</value>
+  </data>
+  <data name="CampusMapApp_Title" xml:space="preserve">
+    <value>Campusplan</value>
+  </data>
+  <data name="DepartmentApp_Title" xml:space="preserve">
+    <value>Lehrstühle</value>
+  </data>
+  <data name="EventApp_Title" xml:space="preserve">
+    <value>Events</value>
+  </data>
+  <data name="HomeworkApp_Title" xml:space="preserve">
+    <value>Hausaufgaben</value>
+  </data>
+  <data name="LectureApp_Title" xml:space="preserve">
+    <value>Vorlesung</value>
+  </data>
+  <data name="LinkApp_Title" xml:space="preserve">
+    <value>Links</value>
+  </data>
+  <data name="MailApp_Title" xml:space="preserve">
+    <value>Webmail</value>
+  </data>
+  <data name="MensaApp_Title" xml:space="preserve">
+    <value>Mensaplan</value>
+  </data>
+  <data name="NewsApp_Title" xml:space="preserve">
+    <value>News</value>
+  </data>
+  <data name="OpenHoursApp_Title" xml:space="preserve">
+    <value>Öffnungszeiten</value>
+  </data>
+  <data name="OSAApp_Title" xml:space="preserve">
+    <value>Fachschaften</value>
+  </data>
+  <data name="TimeTableApp_Title" xml:space="preserve">
+    <value>Stundenplan</value>
+  </data>
+  <data name="NewsHomeBtn" xml:space="preserve">
+    <value>zur Übersicht</value>
+  </data>
+>>>>>>> d70e3da558c01e1f589ef06e919074b36a45d32c
 </root>
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/packages.config b/CampusAppWP8/CampusAppWP8/packages.config
index c4c1d604..a6c4d07d 100644
--- a/CampusAppWP8/CampusAppWP8/packages.config
+++ b/CampusAppWP8/CampusAppWP8/packages.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="WPtoolkit" version="4.2012.10.30" targetFramework="wp80" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="WPtoolkit" version="4.2012.10.30" targetFramework="wp80" />
 </packages>
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/pages/news/NewsPage.xaml b/CampusAppWP8/CampusAppWP8/pages/news/NewsPage.xaml
index abcdf6b0..9b105479 100644
--- a/CampusAppWP8/CampusAppWP8/pages/news/NewsPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/pages/news/NewsPage.xaml
@@ -1,47 +1,47 @@
-<phone:PhoneApplicationPage
-    x:Class="CampusAppWP8.pages.news.NewsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
-    xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    FontFamily="{StaticResource PhoneFontFamilyNormal}"
-    FontSize="{StaticResource PhoneFontSizeNormal}"
-    Foreground="{StaticResource PhoneForegroundBrush}"
-    SupportedOrientations="Portrait"  Orientation="Portrait"
-    shell:SystemTray.IsVisible="True">
-
-    <!--LayoutRoot ist das Stammraster, in dem alle anderen Seiteninhalte platziert werden-->
-    <Grid x:Name="LayoutRoot" Background="Transparent">
-        <!--Pivotsteuerelement-->
-        <phone:Pivot x:Name="NewsPivot" Title="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}">
-            <!--Pivotelement eins-->
-            <phone:PivotItem Name="NewsPivotHome" Header="{Binding Path=LocalizedResources.NewsApp_Title, Source={StaticResource LocalizedStrings}}">
-                <ListBox x:Name="ButtonPanel" Grid.Row="1">
-                    
-                    <!-- rows
-                    <Button Name="NewsRow01AppButton" Content="Test News Title 01" Click="NewsRow01AppButton_Click" Grid.Row="0" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
-                    </Button>
-                     -->
-                </ListBox>
-            </phone:PivotItem>
-
-            <!--Pivotelement news template
-            <phone:PivotItem Name="NewsPivot01" Header="(timestamp)">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="100"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="90"/>
-                    </Grid.RowDefinitions>
-                    <TextBlock x:Name="NewsHeadline01" Text="(headline)" Grid.Row="0" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="42"/>
-                    <TextBlock x:Name="NewsText01" Text="(text)" Grid.Row="1" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="24" />
-                    <Button Name="NewsHome" Content="zur News Übersicht" Click="NewsHome_Click" Grid.Row="2" VerticalAlignment="Bottom" HorizontalAlignment="Left" />
-                </Grid>
-            </phone:PivotItem>
-            -->
-        </phone:Pivot>
-    </Grid>
+<phone:PhoneApplicationPage
+    x:Class="CampusAppWP8.pages.news.NewsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
+    xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    FontFamily="{StaticResource PhoneFontFamilyNormal}"
+    FontSize="{StaticResource PhoneFontSizeNormal}"
+    Foreground="{StaticResource PhoneForegroundBrush}"
+    SupportedOrientations="Portrait"  Orientation="Portrait"
+    shell:SystemTray.IsVisible="True">
+
+    <!--LayoutRoot ist das Stammraster, in dem alle anderen Seiteninhalte platziert werden-->
+    <Grid x:Name="LayoutRoot" Background="Transparent">
+        <!--Pivotsteuerelement-->
+        <phone:Pivot x:Name="NewsPivot" Title="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}">
+            <!--Pivotelement eins-->
+            <phone:PivotItem Name="NewsPivotHome" Header="{Binding Path=LocalizedResources.NewsApp_Title, Source={StaticResource LocalizedStrings}}">
+                <ListBox x:Name="ButtonPanel" Grid.Row="1">
+                    
+                    <!-- rows
+                    <Button Name="NewsRow01AppButton" Content="Test News Title 01" Click="NewsRow01AppButton_Click" Grid.Row="0" BorderBrush="{x:Null}" Background="{x:Null}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" BorderThickness="0" Padding="0">
+                    </Button>
+                     -->
+                </ListBox>
+            </phone:PivotItem>
+
+            <!--Pivotelement news template
+            <phone:PivotItem Name="NewsPivot01" Header="(timestamp)">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="100"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="90"/>
+                    </Grid.RowDefinitions>
+                    <TextBlock x:Name="NewsHeadline01" Text="(headline)" Grid.Row="0" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="42"/>
+                    <TextBlock x:Name="NewsText01" Text="(text)" Grid.Row="1" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="24" />
+                    <Button Name="NewsHome" Content="zur News Übersicht" Click="NewsHome_Click" Grid.Row="2" VerticalAlignment="Bottom" HorizontalAlignment="Left" />
+                </Grid>
+            </phone:PivotItem>
+            -->
+        </phone:Pivot>
+    </Grid>
 </phone:PhoneApplicationPage>
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/pages/news/RSSNewsTemplate.xaml b/CampusAppWP8/CampusAppWP8/pages/news/RSSNewsTemplate.xaml
index cded6e06..3b9566dc 100644
--- a/CampusAppWP8/CampusAppWP8/pages/news/RSSNewsTemplate.xaml
+++ b/CampusAppWP8/CampusAppWP8/pages/news/RSSNewsTemplate.xaml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <UserControl
     x:Class="CampusAppWP8.pages.news.RSSNewsTemplate"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -27,3 +28,33 @@
         <Button Name="NewsLink" Content="{Binding Path=LocalizedResources.NewsLinkBtn, Source={StaticResource LocalizedStrings}}" Grid.Row="2" VerticalAlignment="Bottom" HorizontalAlignment="Right" />
     </Grid>
 </UserControl>
+=======
+<UserControl
+    x:Class="CampusAppWP8.pages.news.RSSNewsTemplate"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
+    xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    FontFamily="{StaticResource PhoneFontFamilyNormal}"
+    FontSize="{StaticResource PhoneFontSizeNormal}"
+    Foreground="{StaticResource PhoneForegroundBrush}"
+    mc:Ignorable="d"
+    shell:SystemTray.IsVisible="True">
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="100"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="90"/>
+        </Grid.RowDefinitions>
+        
+        <TextBlock x:Name="NewsHeadline" Text="(headline)" Grid.Row="0" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="42"/>
+        <ScrollViewer Grid.Row="1">
+            <TextBlock x:Name="NewsText" Text="(text)" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="24" />
+        </ScrollViewer>
+        <Button Name="NewsHome" Content="{Binding Path=LocalizedResources.NewsHomeBtn, Source={StaticResource LocalizedStrings}}" Grid.Row="2" VerticalAlignment="Bottom" HorizontalAlignment="Left" />
+    </Grid>
+</UserControl>
+>>>>>>> d70e3da558c01e1f589ef06e919074b36a45d32c
diff --git a/CampusAppWP8/CampusAppWP8/pages/news/RSSNewsTemplate.xaml.cs b/CampusAppWP8/CampusAppWP8/pages/news/RSSNewsTemplate.xaml.cs
index e3dce949..4cb20d65 100644
--- a/CampusAppWP8/CampusAppWP8/pages/news/RSSNewsTemplate.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/pages/news/RSSNewsTemplate.xaml.cs
@@ -1,22 +1,22 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Navigation;
-using Microsoft.Phone.Controls;
-using Microsoft.Phone.Shell;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-
-namespace CampusAppWP8.pages.news
-{
-    public partial class RSSNewsTemplate : UserControl
-    {
-        public RSSNewsTemplate()
-        {
-            InitializeComponent();
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Navigation;
+using Microsoft.Phone.Controls;
+using Microsoft.Phone.Shell;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+namespace CampusAppWP8.pages.news
+{
+    public partial class RSSNewsTemplate : UserControl
+    {
+        public RSSNewsTemplate()
+        {
+            InitializeComponent();
+        }
+    }
 }
\ No newline at end of file
diff --git a/CampusAppWP8/packages/WPtoolkit.4.2012.10.30/WPtoolkit.4.2012.10.30.nuspec b/CampusAppWP8/packages/WPtoolkit.4.2012.10.30/WPtoolkit.4.2012.10.30.nuspec
index 3f621d0d..e093d194 100644
--- a/CampusAppWP8/packages/WPtoolkit.4.2012.10.30/WPtoolkit.4.2012.10.30.nuspec
+++ b/CampusAppWP8/packages/WPtoolkit.4.2012.10.30/WPtoolkit.4.2012.10.30.nuspec
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-  <metadata>
-    <id>WPtoolkit</id>
-    <version>4.2012.10.30</version>
-    <title>Windows Phone toolkit</title>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <licenseUrl>http://phone.codeplex.com/license</licenseUrl>
-    <projectUrl>http://phone.codeplex.com/</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Windows Phone toolkit provides a collection of controls, extension methods and page animations to help create beautiful and consistent Windows Phone user interfaces and make common progamming tasks easier. Documentation and source are on CodePlex at http://phone.codeplex.com.</description>
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    <id>WPtoolkit</id>
+    <version>4.2012.10.30</version>
+    <title>Windows Phone toolkit</title>
+    <authors>Microsoft</authors>
+    <owners>Microsoft</owners>
+    <licenseUrl>http://phone.codeplex.com/license</licenseUrl>
+    <projectUrl>http://phone.codeplex.com/</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Windows Phone toolkit provides a collection of controls, extension methods and page animations to help create beautiful and consistent Windows Phone user interfaces and make common progamming tasks easier. Documentation and source are on CodePlex at http://phone.codeplex.com.</description>
     <releaseNotes>Release notes - http://phone.codeplex.com/releases/view/96743
 
 Includes - 
@@ -32,9 +32,9 @@ Removed Tuple.cs
 
 Removed PerformanceProgressBar (though we are taking the suggestion that we should add it back as a descendent of ProgressBar for backcompat)
 
-Removed GestureListener</releaseNotes>
-    <copyright>http://phone.codeplex.com/license</copyright>
-    <language>en-US</language>
-    <tags>wptoolkit toolkit windowsphone wp7 wp7dev phone tk wp7tk controls mango wp8 apollo</tags>
-  </metadata>
+Removed GestureListener</releaseNotes>
+    <copyright>http://phone.codeplex.com/license</copyright>
+    <language>en-US</language>
+    <tags>wptoolkit toolkit windowsphone wp7 wp7dev phone tk wp7tk controls mango wp8 apollo</tags>
+  </metadata>
 </package>
\ No newline at end of file