merge separated-ui into master #1

Merged vdr merged 12 commits into vdr:master from vdr:separated-ui on 16 May 2015