added support for locale changes in the application model which is supported since Luna M6
name refactoring to remove company association