Fix token size in database
Merge remote-tracking branch 'upstream/develop' into develop
Adapted email secrets to figaro