Merge changes from bigjohnson (main, koa)

[Hexagon]

@bigjohnson We would like to merge your changes, any thoughts before we do?

[bigjohnson]

There is a problem using the android screen unlock feature that stop working when you add the db. You can register with it, but it don't appear in the methods listed when you try login. I think is a timeout of something, but I don't undestand where. Could be also the reverse proxy.

[Hexagon]

@bigjohnson Ok! Merged it anyway, and raised issue #4

Have also synced the branches (server/express were a few commits behind main when you started working).

Please let us know if you find a solution to android lock screen. We'll look into it too, when time pops up.