Begin template integration
Merge branch 'master' into integration
Merge branch 'master' into integration
Merge branch 'master' into integration
Merge branch 'master' into integration
fix reset button
Integration of the generation page. Try to reduce bootstrap empty space
Merge branch 'integration' of github:spyrit/datalea into integration
Merge branch 'master' into integration

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

Conflicts:
	app/views/base.html.twig
	app/views/datalea/form/fields.html.twig
	app/views/datalea/generate.html.twig
	src/Spyrit/Datalea/Form/Type/ColumnConfigType.php
	src/Spyrit/Datalea/Form/Type/VariableConfigType.php
fix css
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
Merge branch 'master' into integration

Conflicts:
	app/views/base.html.twig
Merge branch 'master' into integration
Merge branch 'master' into integration
Merge branch 'master' into integration
Merge branch 'master' into integration
Merge remote-tracking branch 'origin/master' into integration