fix an errors
Merge branch 'dev' into dev-localize
add file localization
localize models