173 - partially implemented new file data unit
Merge branch 'develop' of https://github.com/UnifiedViews/Core into develop