fix a comment
Merge remote-tracking branch 'bobby/develop' into develop
create person summary widget
Merge remote-tracking branch 'jon/develop' into develop

Conflicts:
	web/pages/userFamily/scripts/userFamily.js
	web/pages/userFamily/views/userFamily.ejs
Merge remote-tracking branch 'jon/develop' into develop
Merge remote-tracking branch 'henry/develop' into develop
person Image
Merge remote-tracking branch 'jon/develop' into develop