~ fix for using together ExtendedFactoryTrait and PluginableFactoryTrait
~ fix for bug in LanguageFactory
Merge remote-tracking branch 'upstream/master'
~ fix for ExtendedLangFactory
~ fix for missing _sJoinLang set in ExtendedLangFactoryTrait
Merge pull request #6 from deny/master

Fixes for locale and plugin support