Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
added object to class FileClass because we would like to to inherit it