model and test
Merge branch 'dev'

person model and tests