MP1-4488-FEAT-Reset_the_windows_and_folder_history_after_resume_if_the_return_to_home_selected
MP1-4518-FEAT_Send_gui_msg_when_a_manual_recording_started
delete directory if there are read only file
MP1-4488 : rework (pluginhelper)
MP1-4488 : add PluginHelper.cs
MP1-4488 fix
MP1-4488 : rework, new message GUI_MSG_ONRESUME, remove pluginhelper.cs
MP1-4488 : generalize GUI_MSG_ONRESUME message
MP1-4488 : bugfix :(
MP1-4521 : Remember_last_used_folder_in_MyPictures_is_not_working
MP1-4527 : Create action for create bookmark
MP1-4527 : update keymap.xml
MP1-4523 : rename debugoptions to advanced options
remove TvTimeShiftPositionWatcher.cs
MP1-4523 : Fix IsSingleSeat bug
Merge remote-tracking branch 'remotes/origin/MP1-4527-FEAT-Add_keyboard_shortcut_for_add_bookmark_in_My_Video'
Merge remote-tracking branch 'remotes/origin/MP1-4521-BUG-Remember_last_used_folder_in_MyPictures_is_not_working'
Merge remote-tracking branch 'remotes/origin/MP1-4490-BUG-PIN_code_is_shown_in_config_of_the_file_menu'
Merge remote-tracking branch 'remotes/origin/MP1-4488-FEAT-Reset_the_windows_and_folder_history_after_resume_if_the_return_to_home_selected'
Merge remote-tracking branch 'remotes/origin/MP1-4487-FEAT-Enable_to_delete_the_files_with_read_only_attribute'
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