lots of path fixing

app/models/merged/image.rb

@@ -19,7 +19,8 @@ module Merged
 
     def self.all
       return @@images unless @@images.empty?
-      Dir[Rails.root.join Image.asset_root + "*.*"].each do |f|
+      dir = Rails.root.join Image.asset_root + "/*.*"
+      Dir[dir].each do |f|
         file = f.split("/").last
         self.add( file )
       end
@@ -40,7 +41,7 @@ module Merged
     def self.asset_root
       "app/assets/images/" + root
     end
-    
+
     def self.root
       "cms"
     end

app/models/merged/page.rb

@@ -4,7 +4,7 @@ module Merged
     include ActiveModel::Conversion
     extend  ActiveModel::Naming
 
-    @@root
+    @@root = "cms"
     @@files = Set.new Dir.new(Rails.root.join(@@root)).children
 
     attr_reader :name , :content