locale fixes

Conflicts:
	newscoop/src/Newscoop/NewscoopBundle/EventListener/LocaleListener.php