Merge pull request #748 from xdot/master

cBlockInfo now manages the respective cBlockHandler
Implemented vanilla-like fluid simulator