Fixed issue 38. Folder names can no longer be repeated. Repaired foldering functionality that got lost in a merge somewhere.
Uncommented some code that shouldn't have been commented.
Merge pull request #42 from ozone-development/folder-rename-bugs

Folder rename bugs