Make sure $app['locale'] stays set. Fixes #1405.

Conflicts:
	.gitmodules
	app/view/files.twig
Updating the 'about' page: remove timthumb and fancybox, add Magnific Popup. Fixes #1376