WidgetDataBuilder created and tested
Merge remote-tracking branch 'origin/master'