Fixed server public key fingerprint
Merge branch 'develop'