Updated server file to reflect latest version.
Merge branch 'master' of https://github.com/jyggen/discourse

Conflicts:
	config/locales/server.cs.yml