merge ui into development
merge ui into development

2015SebINF1340/dmptool,derDaywalker/dmptool,2015SebINF1340/dmptool,derDaywalker/dmptool,derDaywalker/dmptool,derDaywalker/dmptool,2015SebINF1340/dmptool