Merge pull request #5 from jittat/master

consolidate after big merge

Gemfile.lock

@@ -37,7 +37,7 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
-    best_in_place (3.0.2)
+    best_in_place (3.0.3)
       actionpack (>= 3.2)
       railties (>= 3.2)
     builder (3.0.4)
@@ -47,23 +47,21 @@ GEM
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.9.0)
     diff-lcs (1.2.5)
     dynamic_form (1.1.4)
     erubis (2.7.0)
-    execjs (2.2.2)
+    execjs (2.3.0)
     haml (4.0.6)
       tilt
     hike (1.2.3)
     i18n (0.7.0)
     in_place_editing (1.2.0)
     journey (1.0.4)
-    json (1.8.1)
-    mail (2.5.4)
-    jquery-rails (3.1.1)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-tablesorter (1.12.7)
+    jquery-tablesorter (1.13.4)
       railties (>= 3.1, < 5)
     jquery-timepicker-addon-rails (1.4.1)
       railties (>= 3.1)
@@ -74,7 +72,7 @@ GEM
       jquery-rails
       jquery-ui-rails (= 4.0.3)
       railties (>= 3.1.0)
-    json (1.8.1)
+    json (1.8.2)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -90,7 +88,7 @@ GEM
       rack (>= 0.4)
     rack-ssl (1.3.4)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (3.2.21)
       actionmailer (= 3.2.21)
@@ -108,16 +106,16 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.4.2)
-    rdiscount (2.1.7.1)
+    rdiscount (2.1.8)
     rdoc (3.12.2)
       json (~> 1.4)
-    rouge (1.6.2)
-    rspec-collection_matchers (1.0.0)
+    rouge (1.8.0)
+    rspec-collection_matchers (1.1.2)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (2.99.2)
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.2)
+    rspec-mocks (2.99.3)
     rspec-rails (2.99.0)
       actionpack (>= 3.0)
       activemodel (>= 3.0)
@@ -127,7 +125,7 @@ GEM
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
       rspec-mocks (~> 2.99.0)
-    sass (3.4.9)
+    sass (3.4.11)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -144,8 +142,8 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.42)
-    uglifier (2.6.0)
+    tzinfo (0.3.43)
+    uglifier (2.7.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     will_paginate (3.0.7)
@@ -169,9 +167,8 @@ DEPENDENCIES
   rails (= 3.2.21)
   rdiscount
   rouge
+  rspec-rails (~> 2.99.0)
   sass-rails (~> 3.2.6)
-  rspec-rails (~> 2.0)
-
   test-unit
   uglifier
   verification!