In CategoriesList class method name changed from GetCategoryById to GetCategory; in File classes null implementation of related interfaces
Merge branch 'master' into kzielinski
Merge branch 'kzielinski'
Bin folder deleted
Conflicts resolved