Display de page contexts in the mobile version as set in structure

Conflicts:
	Gemfile
	config/mongoid.yml

.gitignore

@@ -14,7 +14,9 @@ public/uploads/**/*
 solr/data
 tmp/**/*
 uploads/**/*
-
+config/*.god
+log/*.gz
+tmp/restart.txt
 *.swp
 *.pid
 *.lck
@@ -22,4 +24,3 @@ uploads/**/*
 .sass-cache/*
 *.supported
 mongoid.yml
-*.

Gemfile

@@ -11,15 +11,15 @@ gem "net-ldap", "~> 0.3.1"
 gem 'devise', '1.5.3'
 gem 'exception_notification' # Send error trace
 gem 'execjs'
-gem 'jquery-rails', '3.0.4'
-gem 'jquery-ui-rails', "4.0.5"
+gem 'jquery-rails', '2.1.4'
+gem 'jquery-ui-rails'
 gem "select2-rails", '3.3.1'
 gem 'kaminari'
-gem 'time_difference'
 gem "acts_as_unvlogable"
 gem 'youtube_it'
 gem 'gotcha'
 
+
 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"
 
@@ -39,7 +39,7 @@ gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
 # gem 'ruby-debug19'
-gem 'rubyzip', '< 1.0.0'
+gem 'rubyzip','0.9.9'
 
 gem 'sunspot_mongo'
 gem 'sunspot_solr'
@@ -50,8 +50,7 @@ gem 'sinatra'
 gem 'sprockets'
 gem 'social-share-button'
 
-gem 'ckeditor'
-# gem 'tinymce-rails', "~> 3.5.8"
+gem 'tinymce-rails', '3.5.8.3'
 gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'libv8', '~> 3.11.8' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'mongoid-encryptor', :require => 'mongoid/encryptor'
@@ -98,8 +97,6 @@ group :test, :development do
   gem "watchr"
   gem "spork"
   gem "capybara"
-  #gem 'rack-mini-profiler'
-  gem "better_errors"
   # gem 'yard'
   # gem "bluecloth"
 end