Part of localisation
Merge branch 'audio_player'

Conflicts:
	app/Bootstrap.php
	app/layouts/frontend.phtml