Merge branch 'master' into integration

Conflicts:
	app/views/base.html.twig
	app/views/datalea/index.html.twig
Merge branch 'integration' of github:spyrit/datalea into integration

Conflicts:
	app/views/base.html.twig
	app/views/datalea/form/fields.html.twig
	app/views/datalea/index.html.twig
	src/Spyrit/Datalea/Controller/MainControllerProvider.php
	src/Spyrit/Datalea/Form/Type/ConfigType.php
Implement and prepare About & Tutorial pages
Continue integration + add "tutorial", "about" & "introduction" page
Update translations
Merge remote-tracking branch 'origin/integration' into integration