diff --git a/.gitignore b/.gitignore
index 0598de0..f176882 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 !.rspec
 !.slugignore
 !.travis.yml
+!.openshift
 *~
 
 
@@ -66,4 +67,4 @@ brakeman.html
 
 # Ignore sensitive data
 /config/settings/local.rb
-/nbproject/private/
\ No newline at end of file
+/nbproject/private/
diff --git a/.openshift/action_hooks/start b/.openshift/action_hooks/start
new file mode 100644
index 0000000..a2c8532
--- /dev/null
+++ b/.openshift/action_hooks/start
@@ -0,0 +1,7 @@
+#!/bin/bash
+# The logic to start up your application should be put in this
+# script. The application will work only if it binds to
+# $OPENSHIFT_INTERNAL_IP:8080
+export PATH=$OPENSHIFT_RUNTIME_DIR/bin:$PATH
+cd $OPENSHIFT_REPO_DIR
+rails server -b $OPENSHIFT_INTERNAL_IP -p $OPENSHIFT_INTERNAL_PORT -d
diff --git a/.openshift/action_hooks/stop b/.openshift/action_hooks/stop
new file mode 100644
index 0000000..259cea5
--- /dev/null
+++ b/.openshift/action_hooks/stop
@@ -0,0 +1,4 @@
+#!/bin/bash
+# The logic to stop your application should be put in this script.
+kill -9 `ps -ef | grep "rails server" | grep -v grep | awk '{ print $2 }'` > /dev/null 2>&1
+exit 0
diff --git a/Gemfile b/Gemfile
index 9337584..934b429 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-ruby '2.0.0'
+#ruby '2.0.0'
 gem 'rails', '4.0.0'
 gem 'pg'
 gem 'haml'
diff --git a/Gemfile.lock b/Gemfile.lock
index e88b8e1..c9d47c5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,13 @@
 GIT
   remote: git://github.com/josevalim/rails-footnotes.git
-  revision: 8411b4cec668b133ec3f7d3be6d39e77ee3abe9e
+  revision: 961015b3a73c2a0fc6b9501fc001e6eb082b7025
   specs:
-    rails-footnotes (4.0.0)
+    rails-footnotes (4.0.1)
       rails (>= 3.2)
 
 GIT
   remote: git://github.com/svenfuchs/i18n-active_record.git
-  revision: 55507cf59f8f2173d38e07e18df0e90d25b1f0f6
+  revision: 2d9a22b6a4e5d809782cdbfa65b14d9e47aa27fc
   specs:
     i18n-active_record (0.0.2)
       i18n (>= 0.5.0)
@@ -44,10 +44,7 @@ GEM
     addressable (2.3.6)
     arel (4.0.2)
     awesome_print (1.2.0)
-    bcrypt (3.1.7)
     bcrypt (3.1.7-x86-mingw32)
-    bcrypt-ruby (3.1.5)
-      bcrypt (>= 3.1.3)
     bcrypt-ruby (3.1.5-x86-mingw32)
       bcrypt (>= 3.1.3)
     better_errors (1.1.0)
@@ -73,12 +70,9 @@ GEM
       image_optimizer (~> 1.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
-    childprocess (0.5.2)
+    childprocess (0.5.3)
       ffi (~> 1.0, >= 1.0.11)
-    chunky_png (1.3.0)
+    chunky_png (1.3.1)
     coderay (1.1.0)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -87,7 +81,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
-    compass (0.12.5)
+    compass (0.12.6)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.2.19)
@@ -114,22 +108,21 @@ GEM
       railties (>= 3.0.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.3)
     ffi (1.9.3-x86-mingw32)
-    forgery (0.5.0)
+    forgery (0.6.0)
     formatador (0.2.4)
     foundation-rails (5.2.2.0)
       railties (>= 3.1.0)
       sass (>= 3.2.0)
     fssm (0.2.10)
-    geocoder (1.1.9)
-    guard (2.6.0)
+    geocoder (1.2.1)
+    guard (2.6.1)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rspec (4.2.8)
+    guard-rspec (4.2.9)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
     haml (4.0.5)
@@ -146,23 +139,22 @@ GEM
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.2.0)
+    jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
     json (1.8.1)
-    jwt (0.1.11)
+    jwt (0.1.13)
       multi_json (>= 1.5)
     launchy (2.4.2)
       addressable (~> 2.3)
-    listen (2.7.1)
+    listen (2.7.5)
       celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.5)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    meta_request (0.2.9)
+    meta_request (0.3.0)
       callsite
       rack-contrib
       railties
@@ -170,16 +162,13 @@ GEM
     mime-types (1.25.1)
     mini_magick (3.7.0)
       subexec (~> 0.2.1)
-    mini_portile (0.5.3)
+    mini_portile (0.6.0)
     minitest (4.7.5)
-    multi_json (1.9.2)
+    multi_json (1.10.0)
     multipart-post (2.0.0)
     nested_form (0.3.2)
-    nio4r (1.0.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    nokogiri (1.6.1-x86-mingw32)
-      mini_portile (~> 0.5.0)
+    nokogiri (1.6.2.1-x86-mingw32)
+      mini_portile (= 0.6.0)
     oauth (0.4.7)
     oauth2 (0.8.1)
       faraday (~> 0.8)
@@ -187,16 +176,11 @@ GEM
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
       rack (~> 1.2)
-    paper_trail (3.0.1)
+    paper_trail (3.0.2)
       activerecord (>= 3.0, < 5.0)
       activesupport (>= 3.0, < 5.0)
-    pg (0.17.1)
     pg (0.17.1-x86-mingw32)
     polyglot (0.3.4)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
     pry (0.9.12.6-x86-mingw32)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -225,9 +209,9 @@ GEM
       activesupport (= 4.0.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.2.2)
+    rake (10.3.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-inotify (0.9.4)
       ffi (>= 0.5.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -248,7 +232,7 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rubyzip (1.1.3)
-    safe_yaml (1.0.2)
+    safe_yaml (1.0.3)
     sass (3.2.19)
     sass-rails (4.0.3)
       railties (>= 4.0.0, < 5.0)
@@ -286,7 +270,7 @@ GEM
     thread_safe (0.3.3)
     tilt (1.4.1)
     timers (1.1.0)
-    tins (1.1.0)
+    tins (1.3.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
@@ -295,8 +279,8 @@ GEM
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     wdm (0.1.0)
-    webmock (1.17.4)
-      addressable (>= 2.2.7)
+    webmock (1.18.0)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
     websocket (1.0.7)
     win32console (1.3.2-x86-mingw32)
@@ -304,7 +288,6 @@ GEM
       nokogiri (~> 1.3)
 
 PLATFORMS
-  ruby
   x86-mingw32
 
 DEPENDENCIES