merge separated-ui into master 0
#1 opened on 16 May 2015 by vdr