Facebook active state
Merge remote-tracking branch 'upstream/master' into alter

Conflicts:
	Controller/Administration/ParametersController.php
	Resources/views/Administration/Parameters/facebookForm.html.twig
checkstyle
Merge pull request #399 from solispauwels/alter

Facebook active state