Made entity loader read entities from files.
Merge branch 'EntityLoader' into develop