Removing done
Merge remote-tracking branch 'balmor/form-widget'
Merge remote-tracking branch 'ariana/master' into form-widget