changes in the affinity system
Merge branch 'master' of https://github.com/xrubio/pandora