update structure
update gemfile
Merge branch 'dev'