Merge a8dd28d into 9cc78c0

Gemfile

@@ -132,6 +132,9 @@ gem 'humanize'
 gem 'i18n-complements', '>= 0.0.14'
 gem 'i18n-js', '>= 3.0.0.rc12'
 
+# Dates management
+gem 'time_diff'
+
 # XML Parsing/Writing, HTML extraction
 gem 'nokogiri', '~> 1.7.1'
 
@@ -189,7 +192,7 @@ gem 'luhn'
 gem 'bootstrap-slider-rails'
 
 group :development do
-  gem 'bullet', '~> 5.5.0'
+  gem 'bullet', '< 5.6.0'
 
   gem 'quiet_assets'
   # gem 'rack-mini-profiler'

Gemfile.lock

@@ -519,6 +519,9 @@ GEM
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.8)
+    time_diff (0.3.0)
+      activesupport
+      i18n
     timecop (0.9.1)
     timeliness (0.3.8)
     tins (1.15.0)
@@ -586,7 +589,7 @@ DEPENDENCIES
   bootstrap-slider-rails
   bootstrap3-datetimepicker-rails
   browser
-  bullet (~> 5.5.0)
+  bullet (< 5.6.0)
   capybara
   capybara-webkit
   charlock_holmes
@@ -674,6 +677,7 @@ DEPENDENCIES
   teaspoon-jasmine
   therubyracer
   thin
+  time_diff
   timecop
   treetop
   turbolinks (~> 2.0)