merge with master

Gemfile

@@ -3,7 +3,8 @@ gem 'rails'
 gem 'yajl-ruby', :require => 'yajl'
 
 gem 'bson_ext'
-gem 'carrierwave', '0.5.4'
+gem 'carrierwave'
+gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
 gem 'ckeditor'
 gem 'devise'
 gem 'mini_magick'

Gemfile.lock

@@ -46,8 +46,11 @@ GEM
     bson_ext (1.5.2)
       bson (= 1.5.2)
     builder (3.0.0)
-    carrierwave (0.5.4)
+    carrierwave (0.5.8)
       activesupport (~> 3.0)
+    carrierwave-mongoid (0.1.0)
+      carrierwave
+      mongoid
     chronic (0.6.6)
     ckeditor (3.6.3)
       mime-types (~> 1.16)
@@ -190,7 +193,8 @@ PLATFORMS
 
 DEPENDENCIES
   bson_ext
-  carrierwave (= 0.5.4)
+  carrierwave
+  carrierwave-mongoid
   ckeditor
   coffee-rails
   database_cleaner

config/initializers/carrierwave.rb

@@ -1,4 +1,4 @@
-require 'carrierwave/orm/mongoid'
+#require 'carrierwave/orm/mongoid'
 
 begin
   db_config = YAML::load(File.read(File.join(Rails.root, "/config/mongoid.yml")))