Added a function to the block template,
Added all the corresponding functions
Changed a bit about how default.twig processes and places blocks.
Merge remote-tracking branch 'origin/master'