'bla bla'
Merge remote-tracking branch 'origin/max' into max

Conflicts:
	framework/Route.php
	framework/Router.php
'framework'