complete server
Add keystore
Merge remote-tracking branch 'origin/master'