merge development into ui
merge development into ui

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