Merge branch 'master' of https://github.com/MediaPortal/MediaPortal-1
MP1-4497-FEAT-Add_new_sort_method_so_that_only_the_Title_and_Duration_are_visible_in_Shares_view
MP1-4504 : Allow_update_subfolder_settings_after_parent_folder_setting_is_changed
MP1-4504 : Add FolderSetting.cs files
MP1-4504 : fix root issue
Merge branch 'master' of https://github.com/MediaPortal/MediaPortal-1
MP1-4518-FEAT_Send_gui_msg_when_a_manual_recording_started
Merge branch 'master' of https://github.com/MediaPortal/MediaPortal-1
MP1-4523 : rename debugoptions to advanced options
remove TvTimeShiftPositionWatcher.cs
MP1-4523 : Fix IsSingleSeat bug
Merge branch 'master' of ssh://github.com/MediaPortal/MediaPortal-1 into MP1-4497-FEAT-Add_new_sort_method_so_that_only_the_Title_and_Duration_are_visible_in_Shares_view

Conflicts:
	mediaportal/MediaPortal.Base/language/strings_en.xml
Merge branch 'master' of ssh://github.com/MediaPortal/MediaPortal-1 into MP1-4504-FEAT-Allow_update_subfolder_settings_after_parent_folder_setting_is_changed_V2

Conflicts:
	mediaportal/Core/guilib/GUIMessage.cs
Merge branch 'master' of ssh://github.com/MediaPortal/MediaPortal-1 into MP1-4518-FEAT_Send_gui_msg_when_a_manual_recording_started

Conflicts:
	mediaportal/Core/guilib/GUIMessage.cs
Merge branch 'master' of https://github.com/MediaPortal/MediaPortal-1
Merge remote-tracking branch 'remotes/origin/MP1-4497-FEAT-Add_new_sort_method_so_that_only_the_Title_and_Duration_are_visible_in_Shares_view'
Merge remote-tracking branch 'remotes/origin/MP1-4504-FEAT-Allow_update_subfolder_settings_after_parent_folder_setting_is_changed'
Merge remote-tracking branch 'remotes/origin/MP1-4518-FEAT_Send_gui_msg_when_a_manual_recording_started'
Merge remote-tracking branch 'remotes/origin/MP1-4523-FEAT_Change_the_TV_plugin_'Use_UNC_paths'_config_setting_to_a_non-debug_option'
Revert "Merge remote-tracking branch 'remotes/origin/MP1-4523-FEAT_Change_the_TV_plugin_'Use_UNC_paths'_config_setting_to_a_non-debug_option'"

This reverts commit 16a751599816209a9b5784a99a5953d103b39399, reversing
changes made to 5058ca772f4c4e6da1bd8820c57baf8088ef6ee0.
Merge branch 'master' of https://github.com/hkjensen/MediaPortal-1