Fix errors in avoiding duplicate bap or source

Fix errors in avoiding duplicate bap or source.
Fixes to correct and sort export output

Fix 046 to correct missing or duplicated outputs and fix 050 to sort
multi-field export outputs.
Improve filter by attribute performance

Improve filter by attribute performance for large numbers of incids by
avoiding repeated calls to get the underlying data type.
Make message box on advanced query builder 'modal'

Make message box on advanced query builder 'modal'.
Don't display complete message when merge cancelled

Don't display complete message when logical merge has been cancelled by
user when selecting incid to merge into.
Correct fix number for sorting child tables

Correct fix number for sorting child tables.
Correct fix number for sorting child tables

Correct fix number for sorting child tables.
Update version number and readme files

Update version number and readme files.