refactored all classes, done LocaleMapperTest
refactor LocaleController tests
all tests fixed
fix docblock
cs fix
Merge branch 'massive-refactoring'