Merge branch 'dev'
Merge branch 'dev'
fix deploy
add gemfile.lock
fix AA
tempory remove AA
master merge - preproduction and deploy chnges