Persons model merge

Person models merge finished