@@ -19,9 +19,8 @@ group :assets do

   gem 'coffee-rails', '~> 3.2.1'

   gem 'normalize-rails'

   gem 'compass-rails'

-  gem 'rails-backbone'

+  gem 'backbone-rails'

   gem 'haml_coffee_assets'

-  #gem "marionette-rails", "~> 0.10.2"

   # See https://github.com/sstephenson/execjs#readme for more supported runtimes

   # gem 'therubyracer', :platforms => :ruby

@@ -53,7 +52,7 @@ group :test do

     gem 'casperjs'

 end

-gem 'jquery-rails'

+gem 'jquery-rails', '~> 2.2.1'

 gem 'haml', '~> 3.1.7'

 gem 'haml-rails', '~> 0.3.5'

 gem 'i18n-js'

@@ -31,6 +31,8 @@ GEM

     addressable (2.3.3)

     ansi (1.4.3)

     arel (3.0.2)

+    backbone-rails (1.0.0)

+      rails (>= 3.0.0)

     bcrypt-ruby (3.0.1)

     better_errors (0.7.2)

       coderay (>= 1.0.0)

@@ -72,7 +74,6 @@ GEM

     daemons (1.1.9)

     debug_inspector (0.0.2)

     diff-lcs (1.2.2)

-    ejs (1.1.1)

     em-synchrony (1.0.3)

       eventmachine (>= 1.0.0.beta.1)

     erubis (2.7.0)

@@ -111,16 +112,16 @@ GEM

       tilt (>= 1.3.3)

     hashie (2.0.3)

     highline (1.6.16)

-    hike (1.2.1)

+    hike (1.2.2)

     hiredis (0.4.5)

     i18n (0.6.1)

     i18n-js (2.1.2)

       i18n

     journey (1.0.4)

-    jquery-rails (2.1.4)

+    jquery-rails (2.2.1)

       railties (>= 3.0, < 5.0)

       thor (>= 0.14, < 2.0)

-    json (1.7.7)

+    json (1.8.0)

     launchy (2.2.0)

       addressable (~> 2.3)

     listen (0.7.3)

@@ -146,7 +147,7 @@ GEM

       origin (~> 1.0)

       tzinfo (~> 0.3.22)

     moped (1.4.5)

-    multi_json (1.7.2)

+    multi_json (1.7.3)

     net-scp (1.1.0)

       net-ssh (>= 2.6.5)

     net-sftp (2.1.1)

@@ -184,11 +185,6 @@ GEM

       activesupport (= 3.2.13)

       bundler (~> 1.0)

       railties (= 3.2.13)

-    rails-backbone (0.9.10)

-      coffee-script (~> 2.2.0)

-      ejs (~> 1.1.1)

-      jquery-rails (~> 2.1.3)

-      railties (>= 3.1.0)

     railties (3.2.13)

       actionpack (= 3.2.13)

       activesupport (= 3.2.13)

@@ -238,7 +234,7 @@ GEM

       eventmachine (>= 0.12.6)

       rack (>= 1.0.0)

     thor (0.18.1)

-    tilt (1.3.6)

+    tilt (1.4.1)

     timecop (0.6.1)

     treetop (1.4.12)

       polyglot

@@ -264,6 +260,7 @@ PLATFORMS

   ruby

 DEPENDENCIES

+  backbone-rails

   bcrypt-ruby

   better_errors

   binding_of_caller

@@ -278,7 +275,7 @@ DEPENDENCIES

   haml-rails (~> 0.3.5)

   haml_coffee_assets

   i18n-js

-  jquery-rails

+  jquery-rails (~> 2.2.1)

   launchy

   meta_request

   minitest

@@ -287,7 +284,6 @@ DEPENDENCIES

   normalize-rails

   phantomjs-binaries

   rails (~> 3.2.11)

-  rails-backbone

   rmagick (~> 2.13.2)

   rspec-rails

   sass-rails (~> 3.2.3)

@@ -1,9 +1,8 @@

 #= require websocket_rails/main

 #= require hamlcoffee

+#= require json2

 #= require underscore

 #= require backbone

-#= require backbone_rails_sync

-#= require backbone_datalink

 #= require backbone/xmpp

 #= require i18n

 #= require i18n/translations