hotfix
Merge branch 'develop' of https://github.com/phpXFace/phpXFace into develop

* 'develop' of https://github.com/phpXFace/phpXFace:
  config handling
  DI bugfixes
  link element fix
  stylesheet register implementation

Conflicts:
	src/phpXFace/lib/cssreader/CssCollector.php