Search results are now synchronized correctly in the adding thread

The category selection is hanging some times while searching. I cannot
figure out why.
Merged changes to ResultTask with master

Fixed merge conflict in SyncTreeViewSkin.java by adding both changes.
Fixed stupid merge conflict AGAIN!