Conflicts: CampusAppWP8/CampusAppWP8/Settings.StyleCop CampusAppWP8/CampusAppWP8/Utility/StringManager.cs