Bootstrap language fix
Merge branch 'master' of https://github.com/lombric/BRIC

Conflicts:
	app/themes/bootstrap/views/layouts/main.php