vdr:master
vdr:separated-ui
PR to merge ui branch
merge separated-ui into master
664a2bd
master
separated-ui
PR to merge ui branch
merge separated-ui into master
664a2bdintomasterfromseparated-uion 16 May 2015