Changed EntityTypeAttribute to be stored by EntityType.Name instead of EntityType.Id
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop