add salat mappings
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of C:\Users\yakov_000\workspaces\myWorkspace\myRepo with conflicts.
add salat mappings