change Settings path deploy.rb
fix gems
add new assets
Merge branch 'master' into dev