Registration
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Site/BaseBundle/Resources/assets/styles/common.scss