Merge branch 'master' of ssh://git.vomp.tv:20022/vompclient into scraper_support

Conflicts:
	vdr.cc

diff --cc vdr.cc
index e8d70435596f86f816c25db4767d7bc6b4d33a11,b44744df803a5d50846018f63314d09a9c02eb57..1a3fbacf80829d25bb206166460d9f892726cfbf
--- 1/vdr.cc
--- 2/vdr.cc
+++ b/vdr.cc
@@@ -37,11 -37,8 +37,10 @@@
  #include "vdrcommand.h"
  #include "video.h"
  #include "osd.h"
 +#include "movieinfo.h"
 +#include "seriesinfo.h"
  
- 
- #define VOMP_PROTOCOLL_VERSION 0x00000302
+ #define VOMP_PROTOCOLL_VERSION 0x00000300
  
  VDR* VDR::instance = NULL;
  //prepare a request