- Added switch to disable import function in config.inc.php
- Merged language files.

Added a Checkbox to the language import form to ignore the version of the language file.