Conflicts: CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop