Configuration changes
Merge branch 'master' of github.com:sergevm/vs_config

Conflicts:
	Resharper/GlobalSettingsStorage.DotSettings