Fix files conflict with gnome-dropbox.
Fix files conflict with gnome-dropbox.
Rename desktop file as caja-dropbox.desktop, fix conflict with gnome-dropbox.
Rename desktop file as caja-dropbox.desktop, fix conflict with gnome-dropbox.
Merge pull request #2 from hillwoodroc/master

Fix files conflict with nautilus-dropbox