added conflict handling to removeFileFromParentFolder and fixed fileTree mistaken changes on move/delete/etc.
added conflict handling to removeFileFromParentFolder and fixed fileTree mistaken changes on move/delete/etc.

LupoLibero/Lupo-proto