Merge branch 'master' into new-gui

Conflicts:
	Gemfile.lock

Gemfile

@@ -4,6 +4,8 @@ gem 'rails', '~>4.0.0'
 gem 'sass-rails', '~>4.0.0'
 gem 'coffee-rails', '~>4.0.0'
 
+gem 'json'
+
 # todo: remove xml api 
 gem 'actionpack-xml_parser', git: 'https://github.com/rails/actionpack-xml_parser'
 

Gemfile.lock

@@ -75,10 +75,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
-<<<<<<< HEAD
     commonjs (0.2.6)
-=======
->>>>>>> master
     cucumber (1.3.5)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -108,6 +105,7 @@ GEM
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
+    json (1.8.0)
     less (2.3.2)
       commonjs (~> 0.2.6)
     less-rails (2.3.3)
@@ -231,6 +229,7 @@ DEPENDENCIES
   factory_girl_rails
   htmlentities
   jquery-rails
+  json
   less-rails
   mocha
   mousetrap-rails