Merge branch 'dev'
editor fix on jobs and projects
Merge pull request #205 from SBS-team/test&fix

Test&fix
Merge branch 'dev'
Merge branch 'dev'
Replacing project
changes for replacing
fix deploy
add gemfile.lock
fix AA
tempory remove AA
more changes for replacing
Merge branch 'master' into dev
master merge - preproduction and deploy chnges
change Settings path deploy.rb
fix gems
add new assets
Merge branch 'master' into dev
update deploy.rb
Merge branch 'dev' into test&fix