merge

...ntend_client/app/admin/databases/databases.controllers.js

...s/frontend_client/app/admin/databases/databases.module.js

...nd_client/app/admin/databases/partials/database_edit.html

...nd_client/app/admin/databases/partials/database_list.html

...d_client/app/admin/databases/partials/database_table.html

...nt/app/admin/databases/partials/database_table_field.html

..._client/app/admin/databases/partials/database_tables.html

...rontend_client/app/admin/datasets/datasets.controllers.js

...ces/frontend_client/app/admin/datasets/datasets.module.js

...tend_client/app/admin/datasets/partials/dataset_edit.html

...tend_client/app/admin/datasets/partials/field_detail.html

...nt/app/admin/emailreport/partials/emailreport_detail.html

...ient/app/admin/emailreport/partials/emailreport_list.html

..._client/app/admin/organization/partials/org_settings.html

...ces/frontend_client/app/admin/people/partials/people.html

...frontend_client/app/admin/people/partials/people_add.html

resources/frontend_client/app/app.js

resources/frontend_client/app/directives.js

...ontend_client/app/superadmin/index/partials/settings.html

...t/app/superadmin/organization/organization.controllers.js