Merge remote-tracking branch 'origin/macbook-branch'
Merge remote-tracking branch 'origin/macbook-branch' into imac-branch
added fetch all to personjson model
Merge branch 'imac-branch'
Merge branch 'master' into macbook-branch