Update people.json
Update people_contacts.json
Update people_contacts.json
Update people_contacts_edit.json
Update people_lists.json
Update people_lists_view.json
Update people_lists_add.json
Update people_lists_edit.json
Update people_lists_delete.json
Update people_lists_export.json
Update people_mailings.json
Update people_press.json
Update people_social.json
Update assets_edit.json
Update assets_add.json
Update assets_find.json
Update assets_delete.json
Update assets_uploadform.json
tweak htaccess so subdomain usernames will work with root
Merge remote-tracking branch 'upstream/master'