add server_tokens
Merge branch 'master' of github.com:itayan/dev-ubuntu