Some box2d colliders, better herb organization and draw processing.
Merged to master