update gems and ruby
merge accounts branch for profiles
update coffee-rails
merge server
Merge branch 'master' into carts