Added File entity
Merge branch 'master' of https://github.com/nfqakademija/konani
Restored deleted rows in header template