Merge pull request #11 from boiving/master

Tracker + Session
Some fixes
HUB-32 : Handle port collision on adapters + code refactoring
Merge remote-tracking branch 'upstream/master'