Add possibility to define a 'ttl' block default setting
Merge pull request #57 from eko/2.1

Add possibility to define a 'ttl' block default setting
use stopwatch for in the TraceableBlockRenderer
Merge pull request #59 from lsmith77/stopwatch

use stopwatch for in the TraceableBlockRenderer
Merge branch '2.1'
Fix failing testx
Merge branch 'master' into add_block_context

Conflicts:
	Block/TraceableBlockRenderer.php
	Tests/Block/TraceableBlockRendererTest.php
Fix useless code due to the BlockContextManager
Fix typo