Updated template preprocessing, now uses file entity templates
Merge branch '8.x-2.x' of https://github.com/md-systems/file_entity into 8.x-2.x