Fixed model files, added unique identifiers for each newly created model (entity)
Merge remote-tracking branch 'origin/master'