Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Votolab/RCPXBundle/Resources/views/Home/index.html.twig
Merge remote-tracking branch 'origin/master'