modified child views
person controller and views
Merge origin/master
fixed person controller and views