fixed merg error
Added databaseName property to datasource of unpFormViewer (supported in Unplugged 3), unpFormEditor already had this attribute.
Merge remote-tracking branch 'controls_master/dev/mark'