library
Merge branch 'master' of github.com:xbadcode/Rubezh

Conflicts:
	Projects/Deploy/ConfigurationService/config.fscp