Merge branch "develop-v22" into "master"

[Nils85]

• Tag "v2.1" created on the last commit of the current master branch
• Table "AppSettings" created in the server database