update gems
setup deploy
Merge branch 'feature/ttt' into develop