terms of service update
small fixes
Merge https://github.com/solispauwels/CoreBundle into set-registration-mail-content

Conflicts:
	Listener/LocaleListener.php