Added CustomAPI, merged changes from old UCSF production
SQL to fix bad personIDs
Merge branch 'master' into 2.0.0
Added UCSF specific photo handling
KDIff based merge to match code to product.  Prior to pushing some of Cynthias changes
Merging Cynthia's changes