add text pages
Merge branch 'master' of github.com:Riland/sandbox into text_pages

Conflicts:
	base/apps/RilandKernel.php
	base/apps/admin/AdminKernel.php
	base/apps/admin/config/routing.yml
	base/apps/client/ClientKernel.php
	base/apps/client/Resources/views/blocks/header.html.twig
	base/apps/client/config/routing.yml
text pages
Merge branch 'master' of github.com:Riland/sandbox into text_pages

Conflicts:
	base/apps/RilandKernel.php
	base/apps/admin/AdminKernel.php
	base/apps/admin/config/routing.yml
	base/apps/client/ClientKernel.php
	base/apps/client/Resources/views/blocks/header.html.twig
	base/apps/client/config/routing.yml
fix in articles
fix
Merge pull request #3 from Riland/articles

Articles
Merge branch 'master' of github.com:Riland/sandbox into filials

Conflicts:
	base/apps/RilandKernel.php
	base/apps/admin/AdminKernel.php
	base/apps/admin/config/routing.yml
	composer.lock
fix composer.lock