Temporary commit so Shalom can do stuff
Merge branch 'unstable' of https://github.com/ARmadillo-reuse/api-server into unstable
Merge branch 'unstable' of https://github.com/ARmadillo-reuse/api-server into unstable
Merge branch 'unstable' of https://github.com/ARmadillo-reuse/api-server into unstable
Fix email parsing on the server