Server branch sync

Synchronized v2.0.0 server
.gitignore updated
branch clean