Merge branch 'master' into mongo_driver_redux

...end_client/app/admin/annotation/annotation.controllers.js

...frontend_client/app/admin/annotation/annotation.module.js

...client/app/admin/annotation/partials/annotation_list.html

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

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

...d_client/app/admin/emailreport/emailreport.controllers.js

...ontend_client/app/admin/emailreport/emailreport.module.js

...tend_client/app/admin/emailreport/emailreport.services.js

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

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

...s/frontend_client/app/annotation/annotation.directives.js

...ces/frontend_client/app/annotation/annotation.services.js

...ntend_client/app/annotation/partials/annotation_form.html

resources/frontend_client/app/app.js

...rces/frontend_client/app/components/core_nav/core_nav.css

resources/frontend_client/app/controllers.js

resources/frontend_client/app/explore/explore.controllers.js

...es/frontend_client/app/explore/partials/table_detail.html

resources/frontend_client/app/search/partials/search.html

resources/frontend_client/app/search/search.controllers.js