Make block.js resolve the block correctly when added to grid areas

Since render responds with a container div when a block is in a area with grid enabled, we previously would fail to create a valid block object when a block was added to that area. Now we always resolve the block correctly.