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
Added a basic userFamily page
Started Person List Widget stuff
Add person model, findAll action
Created AttributeSetList controller and event for Person Selected
Merge remote-tracking branch 'jon/develop' into develop
Merge remote-tracking branch 'bobby/develop' into develop
Merge remote-tracking branch 'henry/develop' into develop
person Image
AttributeSetList - still need to filter by current person.
Merge remote-tracking branch 'jon/develop' into develop
personSummary page
Merge branch 'develop' of github.com:bobbyappdev/appdevjs_hris into develop
Filter Attribute Sets by ObjectId
Merge branch 'develop' of github.com:bobbyappdev/appdevjs_hris into develop
Filter AddributeSet List by ObjectId
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	server/api/api_object_create.js