add MSN_PROXY settings
Merge branch 'master' of github.com:Zagrebelin/intranet