some changes to the dispatcher
Merge branches 'develop' and 'master' of https://github.com/phpXFace/frontcontroller
Merge branch 'master' into develop

* master:
  Merge branches 'develop' and 'master' of https://github.com/phpXFace/frontcontroller
  some changes to the dispatcher

Conflicts:
	composer.json
	src/phpXFace/lib/response/Response.php