newserver journal
Merge branch 'master' of github.com:xbadcode/Rubezh into origin_master

Conflicts:
	Projects/ServerFS2/ServerFS2/Helpers/ServerHelper.cs