fixed weird p2p side collisions
Merge branch 'master' of github.com:ericslee/Grocks
Merge branch 'master' of github.com:ericslee/Grocks