Merge branch 'macbook-branch'
Merge branch 'master' into imac-branch
refactoring person json model
Merge branch 'imac-branch'
Merge branch 'master' into macbook-branch