Merge branch 'development' of https://github.com/Rulingcom/orbit into development

Conflicts:
	config/mongoid.yml

Gemfile

@@ -46,14 +46,15 @@ gem 'sinatra'
 gem 'sprockets'
 gem 'social-share-button'
 
-gem 'tinymce-rails'
+gem 'ckeditor_rails'
+# gem 'tinymce-rails', "~> 3.5.8"
 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'
 gem 'rb-readline','~> 0.4.2' if RUBY_PLATFORM.downcase.include?("linux")
 
 
-gem "impressionist", :git => 'git://github.com/charlotte-ruby/impressionist.git'
+gem "impressionist",'1.2.0'
 #gem 'contacts'
 #gem 'event-calendar', :require => 'event_calendar'#, :git => 'git://github.com/elevation/event_calendar.git'