Updating Jasny Bootstrap, 3.1.1 -> 3.1.2.
Minor changes about Settings library.
Adding a language line.
Adding language lines.
Adding language lines.
A Bulgarian language correction.
A Bulgarian language correction.
Adding language lines.
Updating Transliterate class.
Update French language
Merge commit '840d96c08e3d3c9c94fb77f2a448b691710def59'

Conflicts:
	platform/core/common/language/french/ui_lang.php
Merge branch 'master' into feature/phpmailer