Merge Base Start
Merge-
Finds any differences between files that exist already

TODO:
Also find files that don't exist in the "original" document.
Timer
Comments, and clean up.
Timer tweak (stop and start around messagebox so we don't get a wrong time when waiting for user to click OK)
Checking for non existing images/folders
TODO:
Check image parents before adding to the noDupes as the folder may already be inside (more than likely since it runs first)
Make file dirty when you change the parent of a folder/image
First version of Merge Window :D

Currently shows you in the same style as the main treeview, what folders it found that are different and what images it found that are different
Need to add a "keep/forget' button set and functionality that will add the selected item to the "merged" folder in the main view.
Made it so if you have the MergeWindow open and close the MainWindow it closes merge with it
Forgot to add the NeedsChecking list to MergeWindow
Added a way to open the merge window again after you have run the merge command (so you don't have to run the thing again if you close the window)
Trash change implemented.
Disabled Folder Moving for the time being (really really buggy and i can't find a fix for it atm)
If you select Keep on the "Change Content" content then it will overwrite the data that you currently have.
Otherwise it will add to the Merged Folder.
whitespace and now un needed message box clean up.
Blocking out Drag and drop
Fixed a bug with Merge where the overwriting data still ended up creating a Merge folder and adding itself to it
Drag and Drop Folder reorganizing works.
Fix for being able to drop a folder into itself.
Drag and drop Folder onto Document to add it to the document (like if you drop gifs into levels and then gifs onto root, it adds it back as it was before)
ImageData can now be Drag and Dropped into folders (since we sort alphabetically automatically you can only drop images on folders to add them to it)
Removed the now deprecated move feature since Drag and Drop is fully implemented.
Removed code behind for template since I didn't need it in the end
Made it so if you drop an image on another image, it will add that dropped image to the same folder. (not sure if it's wanted or not but wasn't much to add so)
Merge pull request #22 from TravisEvashkevich/master

Merge Feature