Merge pull request #2531 from Montellese/settings_cleanup_4

more settings cleanup (introducing CDisplaySettings and CProfilesManager)

diff --cc xbmc/Application.cpp
Simple merge

diff --cc xbmc/GUIInfoManager.cpp
Simple merge

diff --cc xbmc/cores/amlplayer/AMLPlayer.cpp
Simple merge

diff --cc xbmc/cores/omxplayer/OMXPlayerVideo.cpp
Simple merge

diff --cc xbmc/input/ButtonTranslator.cpp
Simple merge

diff --cc xbmc/network/upnp/UPnP.cpp
Simple merge

diff --cc xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
Simple merge

diff --cc xbmc/windows/GUIMediaWindow.cpp
Simple merge