peer2server connector updated and some fixes
Merge branch 'master' of github.com:grumpo/SWAzam