Squashed commit of the following:

commit dd4ceca3e091cb541a3522ab9517ef5550d49e76
Author: Scythe42 <scythe42@gmail.com>
Date:   Mon Jan 7 02:44:58 2013 +0100

    Resolved conflicts of merge with master

    Code changes to Mediaportal.cs, GUIWindow.cs and Mediaportal.cspro

commit 2b7ab8e26d700d54b8af3d1a7e5909138261fabc
Merge: 9fb712d dca2410
Author: Scythe42 <scythe42@gmail.com>
Date:   Mon Jan 7 02:17:57 2013 +0100

    Merge branch 'refs/heads/master' into EXP-Windows-7-Half-Full-Screen

    Conflicts:
    	mediaportal/Core/guilib/GUIWindow.cs
    	mediaportal/MediaPortal.Application/MediaPortal.cs
    	mediaportal/MediaPortal.Application/MediaPortal.csproj
    	mediaportal/MediaPortal.Base/skin/Default/mytvguide.xml

commit 9fb712d11db05da2a72f9796a0371ff10c7cf1b3
Author: Scythe42 <scythe42@gmail.com>
Date:   Mon Jan 7 01:40:31 2013 +0100

    Fixed DEBUG statement where a closing bracket was outside the IF !DEBUG statement

commit dca2410ec59855af04524e72fad6a6ff6bac4da3
Merge: fb3f705 a68e439
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Sun Jan 6 21:38:40 2013 +0100

    Merge remote-tracking branch 'remotes/origin/EXP-Avoid_NET2.0_Install_mshtml'

    Conflicts:
    	mediaportal/Utils/Utils.csproj

commit fb3f7054fb2284c3eeaea0c6706b74e647f28535
Merge: d2d6e99 8ec62b1
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Sun Jan 6 21:21:38 2013 +0100

    Merge remote-tracking branch 'remotes/origin/Exp-ActiveRecording_status_missing_in_TVrecordings'

commit d2d6e9950f08eb3ae1b326c315495a28b753b25f
Merge: 620dc86 0b95fbd
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Sun Jan 6 21:16:36 2013 +0100

    Merge remote-tracking branch 'remotes/origin/BUG-4167-Temporary_fix_for_flickering_EPG_problem'

commit 8ec62b1d782cd03664e93c6b028d9d46f25e6b63
Author: GuzziMP <GuzziMP@web.de>
Date:   Sun Jan 6 17:08:20 2013 +0100

    Remove usage of "goto" from sorter code; added secondary sort "byDate" to Genre Sorting

commit 620dc86f8d40b4aa963fc5f822074b007a278663
Merge: 78be7de 3d2f78b
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Sat Jan 5 23:18:57 2013 +0100

    Merge branch 'BUG-4123-Update_satellite.xml'

commit 3d2f78bd868892128c010600b2ee14ff57e5d1f7
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Sat Jan 5 23:17:12 2013 +0100

    Update xml Part2

commit e729b9f8aaea83b420857e21ffc05a7dbb10414c
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Sat Jan 5 23:16:29 2013 +0100

    Update xml Part1

commit 2cde1e9a4f5b7ce92504fb422cfd5a7cb05adc8a
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Sat Jan 5 23:05:25 2013 +0100

    Mantis #4132 :
    Update Satellite.xml

commit 78be7de1825093757b5168dc63081a5aef0035e4
Merge: 8b94708 74b2ca8
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Sat Jan 5 21:58:11 2013 +0100

    Merge remote-tracking branch 'remotes/origin/Bug-4156-Using_TextOffsetY2_in_GUIButton3PartControl_results_in_unnessessary_recalculations'

commit 8b947085afe49832e575eafe3358bd2566a83ad0
Author: dedahr <dedahr@gmail.com>
Date:   Sat Jan 5 20:10:24 2013 +0100

    Fixed default sort defined in video views designer in configuration

commit a68e4394396d55dc15ed0de812709d254526bc86
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Sat Jan 5 20:07:29 2013 +0100

    Avoid using microsoft.mshtml reference to avoid install NET2.0 issues on Win7/Win8.
    Always use internal HTTP.

commit 0b95fbd9c70f4b990f60bb6df52074a0c98967a8
Author: GuzziMP <GuzziMP@web.de>
Date:   Sat Jan 5 02:26:08 2013 +0100

    Change looping of Controls in render loop to for-next to avoid EnumerationChangedException when collection is changed from other thread

commit 535379b5bb4a15f735071ed596473717047f2879
Merge: d1b8de7 f15f992
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Fri Jan 4 21:12:03 2013 +0100

    Merge remote-tracking branch 'remotes/origin/BUG-4149-GUICheckButton_does_not_handle_GUIControl.SelectControl()_and_GUIControl.DeSelectControl()_API_calls'

commit d1b8de740a3e6d2fe7b8fdbaf682b876cc96c0da
Merge: d6fa222 27df76c
Author: dedahr <dedahr@gmail.com>
Date:   Thu Jan 3 19:14:37 2013 +0100

    Merge branch 'BUG-4116-Nfo_Importer_Fixes'

commit 74b2ca840313de52a9efd2b0fb26a37797021728
Author: GuzziMP <GuzziMP@web.de>
Date:   Wed Jan 2 22:54:41 2013 +0100

    Typo in TextOffsetY2 corrected - when it was used, it was leading to unwanted recalculation and thus higher load to GUI

commit f15f992615eb077ccb6792272965a665ea6a1c07
Author: Micropolis <alexgola@t-online.de>
Date:   Tue Jan 1 21:11:06 2013 +0100

    fix to handle GUIControl.SelectControl() and GUIControl.DeSelectControl() API calls (see mantis #4149)

commit d6fa222b766dfb90e804eb39a15797bd74631fe2
Merge: 6823f07 11c95f2
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Wed Jan 2 15:11:50 2013 +0100

    Merge branch 'BUG-4145-Dynamic_Refresh_Rate_Column_Size_Rework'

commit 6823f07ba07a08e2acef800ae8ebf94717e7df42
Merge: 6d27d33 e725c22
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Wed Jan 2 15:10:51 2013 +0100

    Merge remote-tracking branch 'remotes/origin/BUG-4148_TV_Radio_EPG_Coloring'

commit 27df76cfa62887ea43167e47bbc1dc93fdefd6cf
Author: dedahr <dedahr@gmail.com>
Date:   Wed Jan 2 13:20:41 2013 +0100

    "Scan" function (menu button and context menu options) inside MP now obeys "Do not use database" option in share views

commit 6d27d335903a1d59a6c70494e593f5fd41e4d0ae
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Wed Jan 2 12:50:13 2013 +0100

    Revert "Merge remote-tracking branch 'remotes/origin/FEAT-3273-Switch_to_log4net'"

    This reverts commit 7706a04def9fb08ca4b88b103a13534c20026f74, reversing
    changes made to 2b89ef573c72658923ba282176a5fb1214c50ef2.

commit e725c22ab8d018f98e24f1de382db9789440fd0b
Author: ncoH <ncoh@team-mediaportal.com>
Date:   Wed Jan 2 12:28:52 2013 +0100

    Mantis 4148 - TV and radio EPG look terrible without coloring enabled (DefaultWide/Default Skin)

commit 3ec1775baaf4b278c1878fb526f316582556e0ea
Author: ncoH <ncoh@team-mediaportal.com>
Date:   Wed Jan 2 11:20:21 2013 +0100

    Mantis 4148 - TV and radio EPG look terrible without coloring enabled

commit cace3383632b1870d2216a6dc765ceab49fc3bde
Author: dedahr <dedahr@gmail.com>
Date:   Tue Jan 1 23:55:36 2013 +0100

    Added .tbn image extension recognition in MovieInfo screen (non database usercase)
    .tbn extension variable set typo fix (still not visible on nfo read or import)
    make regex expressions for duration tag case insensitive

commit 11c95f2200b036bca57f1ad1afe28292aa03b51b
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Tue Jan 1 13:33:24 2013 +0100

    Change the way of Action resize and copy/paste.

commit 7706a04def9fb08ca4b88b103a13534c20026f74
Merge: 2b89ef5 7a10a1c
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Tue Jan 1 12:43:38 2013 +0100

    Merge remote-tracking branch 'remotes/origin/FEAT-3273-Switch_to_log4net'

commit 873d36480aef0850f5417bce71264636f67c9e44
Author: dedahr <dedahr@gmail.com>
Date:   Tue Jan 1 11:39:26 2013 +0100

    Commit with following fixes:
    1. Duration tag - MP does not recognize "xxx min." string as minutes
    2. folder.jpg is not taken as cover when movie folder is "Dedicated movie folder"
    3. On nfo export, Mp does not create <id> tag
    4. "Do not use database" option is not unchecked when deselecting "Use internal nfo scraper only"
    5. Fix hardoceded string "as" on actors and role read in nfo file
    6. Watched status is not updated if "watched" tag is missing but "playcount" tag exist and is greater than zero (XBMC style)
    7. Import of fanart which filename contains "." fails (ie.: 10.000 BC-fanart.jpg)

commit 2b89ef573c72658923ba282176a5fb1214c50ef2
Merge: 760eda9 c464c73
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Tue Jan 1 10:58:04 2013 +0100

    Merge branch 'BUG-4144-Videoplayer_GC_can_stay_in_a_loop_when_cleanup'

commit 760eda9b90aa875d483e5edc7bd9fe47e5dfaded
Merge: 6acf6c4 4940cb4
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Mon Dec 31 22:03:09 2012 +0100

    Merge remote-tracking branch 'remotes/origin/BUG-3728-Watchdog_Crash'

commit 6acf6c4fdfa72977c3c0f04fe2ba32165eaf7989
Merge: 92759c5 10a147f
Author: dedahr <dedahr@gmail.com>
Date:   Mon Dec 31 18:57:02 2012 +0100

    1. Fixed Show Dialog for restart MP in GUI Setting if changed settings
       requires it to be active
    2. Settings for shares are not saved properly
    3. PIN validation is not active when gioing back to GUISettings from
       "non settings screens" for Shares, Playlist and Extensions settings

commit 10a147f5715f72f559106b4e76834dc11bff2f7a
Author: dedahr <dedahr@gmail.com>
Date:   Mon Dec 31 18:47:50 2012 +0100

    Fixed no PIN validation when return in Gui Setting from non GUISettingsScreens (Go Back Window option "ESC Key")

commit c464c730cf21c77398135ab2919c89255c87b863
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Mon Dec 31 15:23:33 2012 +0100

    Mantis #4144
    Fix loop issue on cleanup.

commit a425a2123553a2102cd5ef8a3751d129369b23f7
Author: dedahr <dedahr@gmail.com>
Date:   Mon Dec 31 14:57:18 2012 +0100

    Some settings properties for share folders was not saved

commit 92759c5bc8d2519e9810c3b834fabfa06313f66a
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Mon Dec 31 10:31:16 2012 +0100

    Avoid listing of no needed files (compilation from VS2010 / Reshaper etc.)
    It give a better view when we have to add new files.

commit a395bcb9c2658f63bc17715b5e0c683c5e7eff7a
Author: dedahr <dedahr@gmail.com>
Date:   Sun Dec 30 17:41:58 2012 +0100

    Variable typo fixed

commit 7c8e40ceb26001a6e2f9654cbb747677765d8157
Author: dedahr <dedahr@gmail.com>
Date:   Sun Dec 30 17:12:23 2012 +0100

    Fix GUISettings screen exit to a non GUISettings window

commit 54ac52ff1f1b1dee3f0a9b2c93ab955a2eeba2c5
Author: GuzziMP <GuzziMP@web.de>
Date:   Sat Dec 29 23:09:53 2012 +0100

    Readd active recordings indicator to recordedTV; remove remotingcalls from BuildItemFromRe4cording and move lately introduced empty channel naming closer to usage in Sort

commit 4940cb4b783fc0b13e1b62307c9912111c136347
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Sat Dec 29 11:04:53 2012 +0100

    Mantis #3728

    Added a check of existence of MediaPortal.xml before starting MediaPortal and avoid a second restart on WatchDog.
    Now if no MediaPortal.xml exist -> Configuration is started -> MediaPortal.xml saved -> WatchDog start MediaPortal -> when close MediaPortal -> log are generated in one shot.

commit b6cfa7845423f6b8928bcbd10d8aa700e66b5c54
Author: dedahr <dedahr@gmail.com>
Date:   Sat Dec 29 00:12:22 2012 +0100

    0004133: [Videos] Search Movie in title views is broken
     - missing comma in SQL string builder (direct commit because of trivial bug and fix)

commit b0a6a7d9086f26e30f61edbb002e4e8bba08f519
Merge: 4fc13e8 03995a3
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Fri Dec 28 17:58:42 2012 +0100

    Merge remote-tracking branch 'remotes/origin/BUG-4110-playing_videos_inside_pictures_section_is_not_working_well'

commit 4fc13e89a5fa4cde9e0c378b0949ca469e0d7e5a
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Fri Dec 28 16:25:20 2012 +0100

    Fixed typo "donne" -> "done" (thx doskabouter)

commit e01d80fee5b854163280d3cd9983bcbd2ad13f99
Author: dedahr <dedahr@gmail.com>
Date:   Fri Dec 28 15:19:44 2012 +0100

    * MP Configuration Skip steps checkboxes event handler fix

commit 626cc4133adeffb9c076b04132a5a2824b2ba88a
Merge: bf8ced0 1aee008
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Fri Dec 28 13:19:24 2012 +0100

    Merge remote-tracking branch 'remotes/origin/BUG_4115-Music_mp4_format_wont_play_if_listed_in_movies_extension'

commit 03995a38a1be5de2d11d6f152fe72a6aa54d7aeb
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Thu Dec 27 21:40:16 2012 +0100

    Get full Filename with extension otherwise detection code will not work correctly.

commit caafe9cac1e64638311c3e97dcb631f02934f8e9
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Thu Dec 27 21:04:09 2012 +0100

    Rework Pause/Resume Music.

commit 1a0dd085af4112ee47267149aaf779c5b23a3d1c
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Thu Dec 27 12:36:24 2012 +0100

    Disable Song notification on music resume.

commit 4f1551541ecaf1af71ca8f14272159af4ce7b659
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Thu Dec 27 11:21:52 2012 +0100

    Update Default/DefaultWide skin for MyPicture.

commit 51e6e350ec0dbcb18d1af0455ec196d6533d3906
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Wed Dec 26 21:10:27 2012 +0100

    Prevent 'Leave a thumb in recording folder' option when we are on MyPictures Plugins (Deda's idea)

commit 1aee0081354e90bed2859150f2ac51345d1c21a5
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Wed Dec 26 13:57:01 2012 +0100

    Fix building issue.

commit 87d86511cfde39bc46b40af84a1ea2efe7958248
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Tue Dec 25 19:28:27 2012 +0100

    Fix SQL error on fast switching (F7/F8) (allow analyse only for pictures files)

commit 91d3ec3c21e87dbe380bc69bf0860a4bfcc9361b
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Mon Dec 24 20:00:08 2012 +0100

    Big rework and better code with fast recursive slide show on big folder.

commit 749f18f498ae18f878d17b9f31866db14b5da16c
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Mon Dec 24 12:40:37 2012 +0100

    Make 'Play Videos In Slideshows' option handled.

commit 2995e57cd8fe139a4acbb799a387189739d5a9f6
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Mon Dec 24 11:56:28 2012 +0100

    Don't skip Video in Pictures when we listening RadioStream / TODO restart RadioStream after video clip.

commit d0dbc6eff3ca8f239dd809b4deeb7d0aaed2ba39
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Mon Dec 24 11:54:35 2012 +0100

    Update correctly video options in Picture config section.

commit 4cf15e25e6df848e2ce94c8107973f6cca6a5991
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Sun Dec 23 10:53:33 2012 +0100

    Add Picture Sort when using Recursive SlideShow.

commit 8146937801e2f5a589eb6ae646563152ae8213de
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Sat Dec 22 23:21:52 2012 +0100

    Rework Recursive SlideShow / Fix Cover Flow didn't start on home directory.

commit d0100e4643b149f946740eeebc80605286218077
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Sat Dec 22 15:40:34 2012 +0100

    Remove Player STOP, it break Video Playlist when Music Playlist is running

commit bf8ced0501933d2aed786e888e367c03931b82cf
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Sat Dec 22 15:00:21 2012 +0100

    Update Tuningdetails DVB-C Germany.Unitymedia Hessen/NRW (thx FreakyJ)
    http://forum.team-mediaportal.com/threads/updated-tuningdetails-dvb-c-germany-unitymedia-hessen-nrw.114903/

commit 2d851baebb800fdf9356d8fa102f8c3f3226673b
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Sat Dec 22 10:15:55 2012 +0100

    Rework and fix Music Playlist (pause / resume) when using MyPictures with Video.
    Parse isPicture in place of WindowsID.
    Parse isPicturePlaylist when resume paused music.

commit 8330423985cddf644c886c5272b92795f05161c8
Merge: e9f8155 0dca50a
Author: Scythe42 <scythe42@gmail.com>
Date:   Sat Dec 22 03:14:25 2012 +0100

    Merge branch 'refs/heads/master' into BUG-3728-Watchdog_Crash

commit e9f81550bc588f3dbaad2b9f82abeef2e7eac3c3
Merge: 09462c0 73b1ab8
Author: Scythe42 <scythe42@gmail.com>
Date:   Thu Dec 20 01:14:34 2012 +0100

    Merge branch 'refs/heads/master' into BUG-3728-Watchdog_Crash

commit e251ba196316944c31a5c8e9a6b844b9ee3d4120
Author: Manfred <manfred@mbnet.fi>
Date:   Tue Dec 18 19:47:02 2012 +0200

    Extended PlayListPlayer to call g_player with media type to prevent false audio/video detection by file extension only

commit 722c7903e391090c7524a69396f1e550d89329bc
Author: sebastiii <sebastiii@team-mediaportal.com>
Date:   Sun Dec 16 15:52:24 2012 +0100

    First Part (SlideShow) F7/F8 to switch between files (video/picture)

commit 7a10a1c3a69747e5d650d5754e18ccca629af375
Author: Bavarian <Bavarian@Team-MediaPortal.com>
Date:   Mon Apr 2 18:53:26 2012 +0200

    Fixing Path.Combine issue

    Signed-off-by: Bavarian <Bavarian@Team-MediaPortal.com>

commit f8f512b3aa94a2346787a2a0b15b59f59dc33780
Author: Bavarian <Bavarian@Team-MediaPortal.com>
Date:   Sun Apr 1 22:19:17 2012 +0200

    fix TVLib logger path issue

    Signed-off-by: Bavarian <Bavarian@Team-MediaPortal.com>

commit 790a09560dd459012a25205f6b2b9eecfe005e76
Author: Bavarian <Bavarian@Team-MediaPortal.com>
Date:   Sun Apr 1 21:16:15 2012 +0200

    adding Log4netWrapper

    Signed-off-by: Bavarian <Bavarian@Team-MediaPortal.com>

commit 50727debc72758f590ea4e483e8960b9cd1490fc
Author: Bavarian <Bavarian@Team-MediaPortal.com>
Date:   Sun Apr 1 20:07:53 2012 +0200

    First implementation with Common Logger in "Common MP-TV3/common.Utils/Logger"

    Signed-off-by: Bavarian <Bavarian@Team-MediaPortal.com>