merge

.gitlab-ci.yml

db/migrations/20180302152113_requests.js

...ations/20180302184519_rename_recipient_user_join_group.js

knexfile.js

src/admin_view/admin_router.js

src/graphql/db_utils.js

src/graphql/schema.js

src/graphql/typeDefs.js

src/index.js

src/ldap/ldap_auth.js

src/ldap/ldap_data.js

src/server.js