Merge with sub_roles

app/controllers/application_controller.rb

@@ -1,7 +1,7 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
   
-  include Parser
+  include ParserFrontEnd, ParserBackEnd
   
   helper :all
   before_filter :set_locale, :set_site
@@ -36,9 +36,9 @@ class ApplicationController < ActionController::Base
   end
   
   # Render the page
-  def render_page
+  def render_page(url = nil)
     if @item
-      render :text => parse_page(@item)
+      render :text => parse_page(@item,url)
     else
       render :text => '404 Not Found'
     end