Update files associated with user on add to database; misc. changes
Merge remote-tracking branch 'origin/master'