do not duplicate mixins on file and folder, test creation and last modification works
Merge pull request #342 from doctrine/file-folder-cleanup

do not duplicate mixins on file and folder, test creation and last modificatin works