wip (updating surikat) but wait next commit to be all ok

restoring progressively all functions
Merge branch 'master' of github.com:surikat/udac.dev

Conflicts:
	Presenter/Delivrer.php
	Presenter/Modifier.php
fix