Merge branch 'b-dev' of F:\github\trunk with conflicts.
changed eshop versions in sqls
revert