diff --git a/.gitignore b/.gitignore
index 93c7eb248..bc936c34c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 .DS_Store
 public/api_doc/
 /.metadata
+vendor/cache
diff --git a/.metadata/.plugins/com.aptana.index.core/2874248206.index b/.metadata/.plugins/com.aptana.index.core/2874248206.index
deleted file mode 100644
index 2200403a8..000000000
Binary files a/.metadata/.plugins/com.aptana.index.core/2874248206.index and /dev/null differ
diff --git a/.metadata/.plugins/com.aptana.index.core/2924452064.index b/.metadata/.plugins/com.aptana.index.core/2924452064.index
deleted file mode 100644
index 982acfcbc..000000000
Binary files a/.metadata/.plugins/com.aptana.index.core/2924452064.index and /dev/null differ
diff --git a/.metadata/.plugins/com.aptana.index.core/4010369919.index b/.metadata/.plugins/com.aptana.index.core/4010369919.index
deleted file mode 100644
index e2902378c..000000000
Binary files a/.metadata/.plugins/com.aptana.index.core/4010369919.index and /dev/null differ
diff --git a/Gemfile b/Gemfile
index 34e81cef6..29b2716a9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'http://ruby.taobao.org'
 #source 'http://ruby.sdutlinux.org/'
 
 unless RUBY_PLATFORM =~ /w32/
@@ -10,11 +10,11 @@ end
 
 gem 'grape', '~> 0.9.0'
 gem 'grape-entity'
-gem 'seems_rateable', path: 'lib/seems_rateable'
+gem 'seems_rateable', '~> 1.0.13'
 gem "rails", "3.2.13"
 gem "jquery-rails", "~> 2.0.2"
 gem "i18n", "~> 0.6.0"
-gem "coderay", "~> 1.0.6"
+gem 'coderay', '~> 1.1.0'
 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 gem "builder", "3.0.0"
 gem 'acts-as-taggable-on', '2.4.1'
@@ -23,14 +23,20 @@ gem 'ruby-ole'
 #gem 'email_verifier', path: 'lib/email_verifier'
 gem 'rufus-scheduler'
 #gem 'dalli', path: 'lib/dalli-2.7.2'
+gem 'rails_kindeditor'
 group :development do
   gem 'grape-swagger'
   #gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git'
-  #gem 'puma'
+  gem 'puma' if RbConfig::CONFIG['host_os'] =~ /linux/
   gem 'pry-rails'
-  gem 'pry-byebug'
-  gem 'better_errors', path: 'lib/better_errors'
-  gem 'rack-mini-profiler', path: 'lib/rack-mini-profiler'
+  if RUBY_VERSION >= '2.0.0'
+    gem 'pry-byebug'
+  else
+    gem 'pry-debugger'
+  end
+  gem 'pry-stack_explorer'
+  gem 'better_errors', '~> 1.1.0'
+  gem 'rack-mini-profiler', '~> 0.9.3'
 end
 
 group :test do
diff --git a/app/api/mobile/apis/comments.rb b/app/api/mobile/apis/comments.rb
index 75932d60f..2e84fe5a9 100644
--- a/app/api/mobile/apis/comments.rb
+++ b/app/api/mobile/apis/comments.rb
@@ -2,6 +2,7 @@
 module Mobile
   module Apis
     class Comments < Grape::API
+      include ApplicationHelper
       resource :comments do
         desc '课程通知评论'
         params do
@@ -82,8 +83,8 @@ module Mobile
               memo: {:subject => params[:subject],:content => '该贴来自手机App意见反馈'},
           }
           cs = CommentService.new
-          memo = cs.create_feedback cs_params, current_user
-          raise "commit failed #{memo.errors.full_messages}" if memo.new_record?
+          memo,message = cs.create_feedback cs_params, current_user
+          raise message if memo.new_record?
           present :status, 0
         end
 
diff --git a/app/api/mobile/apis/users.rb b/app/api/mobile/apis/users.rb
index 9a5307be6..b6d1db25c 100644
--- a/app/api/mobile/apis/users.rb
+++ b/app/api/mobile/apis/users.rb
@@ -82,7 +82,7 @@ module Mobile
         desc "用户搜索"
         params do
           requires :name, type: String, desc: '用户名关键字'
-          requires :search_by, type: String,desc: '搜索依据：0 昵称，1 用户名，2 邮箱'
+          requires :search_by, type: String,desc: '搜索依据：0 昵称，1 用户名，2 邮箱,3 昵称和姓名'
         end
         get 'search/search_user' do
           us = UsersService.new
diff --git a/app/api/mobile/entities/course_dynamic.rb b/app/api/mobile/entities/course_dynamic.rb
index aa8aadbb6..b6e4630e4 100644
--- a/app/api/mobile/entities/course_dynamic.rb
+++ b/app/api/mobile/entities/course_dynamic.rb
@@ -15,6 +15,8 @@ module Mobile
       course_dynamic_expose :type
       course_dynamic_expose :count
       course_dynamic_expose :course_name
+      course_dynamic_expose :course_term
+      course_dynamic_expose :course_time
       course_dynamic_expose :course_id
       course_dynamic_expose :course_img_url
       course_dynamic_expose :message
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 9b66c047f..c055d38ae 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -873,13 +873,15 @@ class CoursesController < ApplicationController
         "show_course_news" => true,
         "show_course_messages" => true,
         "show_bids" => true,
-        "show_course_journals_for_messages" => true
+        "show_course_journals_for_messages" => true,
+        "show_homeworks" => true
     }
     @date_to ||= Date.today + 1
     #
     @date_from = (@date_to - @days) > @course.created_at.to_date ? (@date_to - @days) : @course.created_at.to_date
     #@date_from = @date_to - @days-1.years
     @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
+    @author ||= @course.teacher
     # 决定显示所用用户或单个用户活动
     @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
                                                :with_subprojects => false,
diff --git a/app/controllers/discuss_demos_controller.rb b/app/controllers/discuss_demos_controller.rb
new file mode 100644
index 000000000..a0955efe2
--- /dev/null
+++ b/app/controllers/discuss_demos_controller.rb
@@ -0,0 +1,40 @@
+class DiscussDemosController < ApplicationController
+  def index
+
+    @discuss_demo_list = DiscussDemo.where("body is not null").order("created_at desc").page(params[:page] || 1).per(10)
+  end
+
+  def new
+    @discuss_demo = DiscussDemo.create
+    @discuss_demo.save!
+    @discuss_demo
+  end
+
+  def create
+
+  end
+
+  def update
+    @discuss_demo = DiscussDemo.find(params[:id])
+    @discuss_demo.update_attributes(:title =>  params[:discuss_demo][:title],:body =>  params[:discuss_demo][:body])
+    redirect_to :controller=> 'discuss_demos',:action => 'show',:id => params[:id]
+  end
+
+  def delete
+
+  end
+
+  def destroy
+    asset = Kindeditor::Asset.find_by_owner_id(params[:id])
+    filepath = File.join(Rails.root,"public","files","uploads",
+                         asset[:created_at].to_s.gsub("+0800","").to_datetime.strftime("%Y%m").to_s,
+                         asset[:asset].to_s)
+    File.delete(filepath) if File.exist?filepath
+    DiscussDemo.destroy(params[:id])
+    redirect_to :controller=> 'discuss_demos',:action => 'index'
+  end
+
+  def show
+    @discuss_demo = DiscussDemo.find(params[:id])
+  end
+end
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 545d61155..9bf2ee846 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -91,6 +91,7 @@ class DocumentsController < ApplicationController
 
   def update
     @document.safe_attributes = params[:document]
+    @document.save_attachments(params[:attachments])
     if request.put? and @document.save
       flash[:notice] = l(:notice_successful_update)
       redirect_to document_url(@document)
diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index 2f7092d9a..64157ea42 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -20,7 +20,7 @@ class ForumsController < ApplicationController
       #@memo.author_id = User.current.id
       #@forum = @memo.forum
       cs = CommentService.new
-      @memo = cs.create_feedback params,User.current
+      @memo,message = cs.create_feedback params,User.current
       respond_to do |format|
         if !@memo.new_record?
           format.html { redirect_to forum_path(@memo.forum) }
diff --git a/app/controllers/git_callback_controller.rb b/app/controllers/git_callback_controller.rb
new file mode 100644
index 000000000..717a22961
--- /dev/null
+++ b/app/controllers/git_callback_controller.rb
@@ -0,0 +1,9 @@
+class GitCallbackController < ApplicationController
+
+  def post_update
+    @repository = Repository.find_by_root_url(params[:root_url])
+    @repository.fetch_changesets
+    render :text => 'success'
+  end
+
+end
\ No newline at end of file
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 6a251a80c..de9477b8a 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -58,7 +58,7 @@ class IssuesController < ApplicationController
 
   def index
     retrieve_query
-    sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
+    sort_init(@query.sort_criteria.empty? ? [['updated_on', 'desc']] : @query.sort_criteria)
     sort_update(@query.sortable_columns)
     @query.sort_criteria = sort_criteria.to_a
 
@@ -162,7 +162,7 @@ class IssuesController < ApplicationController
       respond_to do |format|
         format.html {
           render_attachment_warning_if_needed(@issue)
-          flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("#{@issue.source_from}", issue_path(@issue), :title => @issue.subject))
+          flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("#{@issue.subject}", issue_path(@issue), :title => @issue.subject))
           #flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject))
           if params[:continue]
             attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?}
@@ -381,7 +381,7 @@ class IssuesController < ApplicationController
   def retrieve_previous_and_next_issue_ids
     retrieve_query_from_session
     if @query
-      sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
+      sort_init(@query.sort_criteria.empty? ? [['updated_on', 'desc']] : @query.sort_criteria)
       sort_update(@query.sortable_columns, 'issues_index_sort')
       limit = 500
       issue_ids = @query.issue_ids(:order => sort_clause, :limit => (limit + 1), :include => [:assigned_to, :tracker, :priority, :category, :fixed_version])
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index ba312c74a..aaaa4484d 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -109,7 +109,7 @@ class MembersController < ApplicationController
         end
         if params[:flag]
           unless members.present? && members.all? {|m| m.valid? }
-            flash[:error] = members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ')
+            flash[:error] = members.empty? ? l(:label_user_role_null) :members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ')
           else
             flash[:notice] = l(:label_invite_success)
           end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 44e5fd8a3..e9a27cf44 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -340,6 +340,7 @@ class ProjectsController < ApplicationController
       @is_zhuce =false
       flash[:notice] = l(:notice_email_sent, :value => email)
     else
+      flash[:error] = l(:notice_registed_success, :value => email)
       @is_zhuce = true
     end
     respond_to do |format|
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 0c1f65317..6c115fc11 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -92,6 +92,22 @@ class RepositoriesController < ApplicationController
     render :action => 'show', :layout => 'base_projects'
   end
 
+
+  HOOK_TEMPLATE = %Q{#!/bin/sh
+exec sh -c '
+function update()
+{
+        CMD_PATH=`dirname $0`;
+        cd $CMD_PATH;
+        PY_PATH=$PWD/../../git_refresh_changes.py;
+        [[ -s "$PY_PATH"   ]] && $(which python) $PY_PATH $PWD;
+        cd -;
+}
+git update-server-info
+update
+'
+  }
+
   def create
     if params[:repository_scm].to_s == 'Gitlab'
       # add by nwb
@@ -127,7 +143,6 @@ class RepositoriesController < ApplicationController
       if attrs[:attrs_extra].keys.any?
         @repository.merge_extra_info(attrs[:attrs_extra])
       end
-      #by xianbo
 
       @repository.project = @project
       if request.post? && @repository.save
@@ -145,12 +160,11 @@ class RepositoriesController < ApplicationController
                      "</Limit> \n ' >> "+
                      @root_path+"htdocs/"+ @repository_name+"/.htaccess"
           system "cd "+@project_path+" ;git update-server-info"
-          # if(create_repo_file&&create_passwd&&create_group&&init_repository&&add_privilege&&init_server_info)
-          # else
-          # logger.info "An error occured when authenticating "+"create passwd"+@creat_passwd+"create_group"+
-          # crate_group+"create repository file "+create_repo_file+"init repository"+init_repostory+
-          # "aad privilege to rpository"+add_privilege+"init server infos"+init_server_info
-          # end
+
+          File.open(@project_path+"/hooks/post-update", "w+") do |f|
+            f.write(HOOK_TEMPLATE)
+          end
+
           @repository.update_attributes(:login => User.current.login.to_s)
         end
         redirect_to settings_project_url(@project, :tab => 'repositories')
@@ -160,6 +174,8 @@ class RepositoriesController < ApplicationController
              render :action => 'new', :layout =>'base_projects'
            end
       end
+
+
     end
   end
   
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d770a4633..4db471ab4 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -445,15 +445,15 @@ class UsersController < ApplicationController
       else
         activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc')
       end
-      activity = activity.reject { |e|
-            e.act.nil? ||
-            (!User.current.admin? && !e.act.nil?
-            (((e.act_type == "Issue") && !e.act.project.visible?(User.current)) ||
-                (e.act_type == "Bid" && !e.act.courses.first.nil? && e.act.courses.first.is_public == 0 && !User.current.member_of_course?(e.act.courses.first)) ||
-                (e.act_type == "Journal" && e.act.respond_to?("Project") && !e.act.project.visible?(User.current)) ||
-                (e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) ||
-                (e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course))))))
-      }
+      # activity = activity.reject { |e|
+      #       e.act.nil? ||
+      #       (!User.current.admin? && !e.act.nil?
+      #       (((e.act_type == "Issue") && !e.act.project.visible?(User.current)) ||
+      #           (e.act_type == "Bid" && !e.act.courses.first.nil? && e.act.courses.first.is_public == 0 && !User.current.member_of_course?(e.act.courses.first)) ||
+      #           (e.act_type == "Journal" && e.act.respond_to?("Project") && !e.act.project.visible?(User.current)) ||
+      #           (e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) ||
+      #           (e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course))))))
+      # }
       @activity_count = activity.count
       @activity_pages = Paginator.new @activity_count, pre_count, params['page']
       @activity = activity.slice(@activity_pages.offset,@activity_pages.per_page)
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 949ddd643..f35210f01 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -20,7 +20,7 @@ class WelcomeController < ApplicationController
   include WelcomeHelper
   helper :project_score
   caches_action :robots
-  before_filter :find_first_page, :only => [:index]
+  #before_filter :find_first_page, :only => [:index]
   # before_filter :fake, :only => [:index, :course]
   before_filter :entry_select, :only => [:index]
  
diff --git a/app/helpers/api_helper.rb b/app/helpers/api_helper.rb
index c865a500b..afdc306a4 100644
--- a/app/helpers/api_helper.rb
+++ b/app/helpers/api_helper.rb
@@ -60,4 +60,8 @@ module ApiHelper
     end
     [count,is_teacher]
   end
+
+  def get_user_language user
+    (user.language.nil? || user.language == "") ? 'zh':user.language
+  end
 end
\ No newline at end of file
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9629ed437..b4f54f075 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1994,4 +1994,10 @@ module ApplicationHelper
     end
     technical_title
   end
+
+
+  def ie8?
+    request.env["HTTP_USER_AGENT"] =~ /MSIE 8.0/
+  end
+
 end
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index db547061f..bd017757a 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -355,7 +355,7 @@ module CoursesHelper
   # 课程time+term简写（2014.春/2014.秋）国际化输出
   def get_course_term course
     strterm = course.try(:term).to_s
-    if !(User.current.language == 'zh')
+    if !(User.current.language == 'zh'||User.current.language == '')
       strterm == '春季学期' ? strterm =  'spring term' : strterm =  'autumn term'
       str = ( course.try(:time).to_s << '.' << strterm )
       str[0..-6]
@@ -369,7 +369,7 @@ module CoursesHelper
   # 课程term（春季学期/秋季学期）国际化输出
   def get_course_term_locales course
     str = course.try(:term).to_s
-    if !(User.current.language == 'zh')
+    if !(User.current.language == 'zh'||User.current.language == '')
       str == '春季学期' ? str =  ' ' + 'spring term' : str =  ' ' + 'autumn term'
     end
     return str
diff --git a/app/helpers/discuss_demos_helper.rb b/app/helpers/discuss_demos_helper.rb
new file mode 100644
index 000000000..71bf8fb62
--- /dev/null
+++ b/app/helpers/discuss_demos_helper.rb
@@ -0,0 +1,2 @@
+module DiscussDemosHelper
+end
diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb
index b9e658bb5..02bc3d8b3 100644
--- a/app/helpers/watchers_helper.rb
+++ b/app/helpers/watchers_helper.rb
@@ -43,7 +43,7 @@ module WatchersHelper
     )
     method = watched ? 'delete' : 'post'
   
-    link_to text, url, :remote => true, :method => method, :class => css
+    link_to text, url, :remote => true, :method => method, :style => "color: #fff; display:block; padding: 0px 5px; margin-right: 10px; height: 22px; line-height: 21px;padding-top:1px; background: none repeat scroll 0% 0% #64BDD9; TES"
   end
   
   ############## added by linchun  
@@ -278,11 +278,11 @@ module WatchersHelper
     )
     method = applied ? 'delete' : 'post'
 
-    link_to text, url, :remote => true, :method => method ,:class=>css
+    link_to text, url, :remote => true, :method => method ,:style => "color: #fff; display:block; padding: 0px 5px; margin-right: 10px; height: 21px; line-height: 22px;padding-top:1px; background: none repeat scroll 0% 0% #64BDD9; TES"
   end
 
     def exit_project_link(project)
       link_to(l(:label_exit_project),exit_cur_project_path(project.id),
-        :remote => true, :confirm => l(:lable_sure_exit_project), :style => "color: #fff; display:block; padding: 0px 5px; margin-right: 10px; height: 22px; line-height: 22px; background: none repeat scroll 0% 0% #64BDD9; TES" )
+        :remote => true, :confirm => l(:lable_sure_exit_project), :style => "color: #fff; display:block; padding: 0px 5px; margin-right: 10px; height: 21px; line-height: 22px; background: none repeat scroll 0% 0% #64BDD9; TES;padding-top:1px;" )
     end
   end
diff --git a/app/models/bid.rb b/app/models/bid.rb
index e5de47b24..10476b4d3 100644
--- a/app/models/bid.rb
+++ b/app/models/bid.rb
@@ -61,14 +61,21 @@ class Bid < ActiveRecord::Base
     end
   }
 
+  scope :course_visible, lambda {|*args|
+                         includes(:courses).where(Course.allowed_to_condition(args.shift || User.current, :view_homeworks, *args))
+                       }
+
   acts_as_watchable
   acts_as_taggable
 
-  acts_as_event :title => Proc.new {|o| "#{l(:label_requirement)} ##{o.id}: #{o.name}" },
+  acts_as_event :title => Proc.new {|o| "#{l(:label_course_homework)} ##{o.id}: #{o.name}" },
                 :description => :description,
                 :author => :author,
                 :url => Proc.new {|o| {:controller => 'bids', :action => 'show', :id => o.id}}
 
+  acts_as_activity_provider :type => 'homeworks',
+                            :author_key => :author_id
+
   acts_as_activity_provider :find_options => {:include => [:projects, :author]},
                             :author_key => :author_id
 
diff --git a/app/models/discuss_demo.rb b/app/models/discuss_demo.rb
new file mode 100644
index 000000000..6ed8d15b6
--- /dev/null
+++ b/app/models/discuss_demo.rb
@@ -0,0 +1,4 @@
+class DiscussDemo < ActiveRecord::Base
+   attr_accessible :title, :body
+   has_many_kindeditor_assets :assets, :dependent => :destroy
+end
diff --git a/app/models/kindeditor/asset.rb b/app/models/kindeditor/asset.rb
new file mode 100644
index 000000000..bae948c99
--- /dev/null
+++ b/app/models/kindeditor/asset.rb
@@ -0,0 +1,15 @@
+class Kindeditor::Asset < ActiveRecord::Base
+  self.table_name = 'kindeditor_assets'
+  mount_uploader :asset, Kindeditor::AssetUploader
+  validates_presence_of :asset
+  before_save :update_asset_attributes
+  attr_accessible :asset
+  
+  private
+  def update_asset_attributes
+    if asset.present? && asset_changed?
+      self.file_size = asset.file.size
+      self.file_type = asset.file.content_type
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/models/kindeditor/file.rb b/app/models/kindeditor/file.rb
new file mode 100644
index 000000000..4b5f11441
--- /dev/null
+++ b/app/models/kindeditor/file.rb
@@ -0,0 +1,3 @@
+class Kindeditor::File < Kindeditor::Asset
+  mount_uploader :asset, Kindeditor::FileUploader
+end
\ No newline at end of file
diff --git a/app/models/kindeditor/flash.rb b/app/models/kindeditor/flash.rb
new file mode 100644
index 000000000..efaf5de9b
--- /dev/null
+++ b/app/models/kindeditor/flash.rb
@@ -0,0 +1,3 @@
+class Kindeditor::Flash < Kindeditor::Asset
+  mount_uploader :asset, Kindeditor::FlashUploader
+end
\ No newline at end of file
diff --git a/app/models/kindeditor/image.rb b/app/models/kindeditor/image.rb
new file mode 100644
index 000000000..a400c816d
--- /dev/null
+++ b/app/models/kindeditor/image.rb
@@ -0,0 +1,3 @@
+class Kindeditor::Image < Kindeditor::Asset
+  mount_uploader :asset, Kindeditor::ImageUploader
+end
\ No newline at end of file
diff --git a/app/models/kindeditor/media.rb b/app/models/kindeditor/media.rb
new file mode 100644
index 000000000..071763319
--- /dev/null
+++ b/app/models/kindeditor/media.rb
@@ -0,0 +1,3 @@
+class Kindeditor::Media < Kindeditor::Asset
+  mount_uploader :asset, Kindeditor::MediaUploader
+end
\ No newline at end of file
diff --git a/app/models/user.rb b/app/models/user.rb
index 83e08254c..9abe80779 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -214,6 +214,8 @@ class User < Principal
         where(" LOWER(login) LIKE '#{pattern}' ")
       elsif type == "1"
         where(" LOWER(concat(lastname, firstname)) LIKE '#{pattern}' ")
+      elsif type == "3"
+        where(" LOWER(concat(lastname, firstname,login)) LIKE '#{pattern}' ")
       else
         where(" LOWER(mail) LIKE '#{pattern}' ")
       end
@@ -776,7 +778,7 @@ class User < Principal
         (block_given? ? yield(role, self) : true)
       }
       #添加课程相关的权限判断
-     elsif context && context.is_a?(Course)
+    elsif context && context.is_a?(Course)
         return false unless context.allows_to?(action)
         # Admin users are authorized for anything else
         return true if admin?
diff --git a/app/models/user_extensions.rb b/app/models/user_extensions.rb
index 92690d1db..09c88e6df 100644
--- a/app/models/user_extensions.rb
+++ b/app/models/user_extensions.rb
@@ -32,40 +32,42 @@ class UserExtensions < ActiveRecord::Base
   def get_brief_introduction
      return self.brief_introduction
   end
-  
+
+
 # added by meng
   def show_identity
-    if self.identity == 0
-      if User.current.language == 'zh'
-        user_identity = '教师'
-      else
-        user_identity = 'Teacher'
-      end
-    elsif self.identity == 1
-      if User.current.language == 'zh'
-        user_identity = '学生'
-      else
-        user_identity = 'Student'
-      end
-    elsif self.identity == 2
-      if User.current.language == 'zh'
-        user_identity = '企业'
-      else
-        user_identity = 'Enterprise'
-      end
-    elsif self.identity == 3
-      if User.current.language == 'zh'
-        user_identity = '开发者'
-      else
-        user_identity = 'Developer'
+    if User.current.language == 'zh'||User.current.language == ''
+      case self.identity
+        when 0
+          user_identity = l(:label_account_identity_teacher)
+        when 1
+          user_identity = l(:label_account_identity_student)
+        when 2
+          user_identity = l(:label_account_identity_enterprise)
+        when 3
+          user_identity = l(:label_account_identity_developer)
+        else
+          user_identity = ''
       end
     else
-      user_identity = ''
+      case self.identity
+        when 0
+          user_identity = l(:label_account_identity_teacher)
+        when 1
+          user_identity = l(:label_account_identity_student)
+        when 2
+          user_identity = l(:label_account_identity_enterprise)
+        when 3
+          user_identity = l(:label_account_identity_developer)
+        else
+          user_identity = ''
+       end
     end
     return user_identity
   end
-# end 
-  
+# end
+
+
   def self.introduction(user, message)
     unless user.user_extensions.nil?
        info = user.user_extensions
diff --git a/app/services/comment_service.rb b/app/services/comment_service.rb
index e74cc902b..f75e14b85 100644
--- a/app/services/comment_service.rb
+++ b/app/services/comment_service.rb
@@ -1,4 +1,6 @@
 class CommentService
+  include ApiHelper
+  include Redmine::I18n
   #评论
   def news_comments params,current_user
     @news = News.find(params[:id])
@@ -84,7 +86,8 @@ class CommentService
     @memo.forum_id = "1"
     @memo.author_id = current_user.id
     @memo.save
-    @memo
+    message = "#{l(:label_commit_failed,:locale => get_user_language(current_user))}: #{@memo.errors.full_messages}" if @memo.new_record?
+    [@memo,message]
   end
 
   #课程留言列表
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 1ec8a0ef0..c689d699d 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -38,7 +38,7 @@ class CoursesService
     if name.blank?
       raise 'sumbit empty'
     end
-    @courses = courses_all.visible
+    @courses = courses_all.visible(current_user)
     if params[:name].present?
       @courses_all = @courses.like(params[:name])
     else
@@ -346,7 +346,7 @@ class CoursesService
       membership = @user.coursememberships.all(:conditions => Course.visible_condition(current_user))
     end
     if membership.nil? || membership.count == 0
-      raise l(:label_no_courses,:locale => current_user.language.nil? ? 'zh':current_user.language)
+      raise l(:label_no_courses,:locale => get_user_language(current_user))
     end
     membership.sort! {|older, newer| newer.created_on <=> older.created_on }
     result = []
@@ -355,19 +355,19 @@ class CoursesService
       latest_course_dynamics = []
       latest_news = course.news.order("created_on desc").first
       unless latest_news.nil?
-        latest_course_dynamics << {:type => 1,:time => latest_news.created_on,:message => l(:label_recently_updated_notification,:locale => current_user.language.nil? ? 'zh':current_user.language)}
+        latest_course_dynamics << {:type => 1,:time => latest_news.created_on,:message => l(:label_recently_updated_notification,:locale => get_user_language(current_user))}
       end
       latest_message = course.journals_for_messages.order("created_on desc").first
       unless latest_message.nil?
-        latest_course_dynamics << {:type => 2,:time => latest_message.created_on,:message => l(:label_recently_updated_message,:locale => current_user.language.nil? ? 'zh':current_user.language)}
+        latest_course_dynamics << {:type => 2,:time => latest_message.created_on,:message => l(:label_recently_updated_message,:locale => get_user_language(current_user))}
       end
       latest_attachment = course.attachments.order("created_on desc").first
       unless latest_attachment.nil?
-        latest_course_dynamics << {:type => 3,:time => latest_attachment.created_on,:message => l(:label_recently_updated_courseware,:locale => current_user.language.nil? ? 'zh':current_user.language)}
+        latest_course_dynamics << {:type => 3,:time => latest_attachment.created_on,:message => l(:label_recently_updated_courseware,:locale => get_user_language(current_user))}
       end
       latest_bid = course.homeworks.order('updated_on DESC').first
       unless latest_bid.nil?
-        latest_course_dynamics << {:type => 4,:time => latest_bid.updated_on,:message => l(:label_recently_updated_homework,:locale => current_user.language.nil? ? 'zh':current_user.language)}
+        latest_course_dynamics << {:type => 4,:time => latest_bid.updated_on,:message => l(:label_recently_updated_homework,:locale => get_user_language(current_user))}
       end
       #每个作业中的最新留言
       messages = []
@@ -382,7 +382,7 @@ class CoursesService
       end
       latest_bid_message = messages.first
       unless latest_bid_message.nil?
-        latest_course_dynamics << {:type => 4,:time => latest_bid_message.created_on,:message => l(:label_recently_updated_message,:locale => current_user.language.nil? ? 'zh':current_user.language)}
+        latest_course_dynamics << {:type => 4,:time => latest_bid_message.created_on,:message => l(:label_recently_updated_message,:locale => get_user_language(current_user))}
       end
       #每个作业中学生最后提交的作业
       homeworks = []
@@ -397,12 +397,12 @@ class CoursesService
       end
       latest_homework_attach = homeworks.first
       unless latest_homework_attach.nil?
-        latest_course_dynamics << {:type => 4,:time => latest_homework_attach.updated_at,:message => l(:label_recently_updated_homework,:locale => current_user.language.nil? ? 'zh':current_user.language)}
+        latest_course_dynamics << {:type => 4,:time => latest_homework_attach.updated_at,:message => l(:label_recently_updated_homework,:locale => get_user_language(current_user))}
       end
       latest_course_dynamics.sort!{|order,newer| newer[:time] <=> order[:time]}
       latest_course_dynamic = latest_course_dynamics.first
       unless latest_course_dynamic.nil?
-        result << {:course_name => course.name,:course_id => course.id,:course_img_url => url_to_avatar(course),:type => latest_course_dynamic[:type],:update_time => latest_course_dynamic[:time],:message => latest_course_dynamic[:message],:count => nil}
+        result << {:course_name => course.name,:course_id => course.id,:course_img_url => url_to_avatar(course),:course_time => course.time,:course_term => course.term,:type => latest_course_dynamic[:type],:update_time => latest_course_dynamic[:time],:message => latest_course_dynamic[:message],:count => nil}
       end
     end
     result.sort!{|order,newer| newer[:update_time] <=> order[:update_time]}
diff --git a/app/services/users_service.rb b/app/services/users_service.rb
index f75a84c5b..39ca37d26 100644
--- a/app/services/users_service.rb
+++ b/app/services/users_service.rb
@@ -193,7 +193,6 @@ class UsersService
       @current_user.save
         #raise @current_user.errors.full_message
         #return @current_user
-
     else
       raise 'wrong password'
     end
diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb
index 0949899dd..0772529f9 100644
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@@ -1,5 +1,22 @@
 <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
 <% if defined?(container) && container && container.saved_attachments %>
+  <% container.attachments.each_with_index do |attachment, i| %>
+    <span id="attachments_p<%= i %>" class="attachment">
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
+      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%>
+      <%= if attachment.id.nil?
+            #待补充代码
+          else
+            link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
+          end
+      %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+  <% end %>
   <% container.saved_attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="attachment">
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
@@ -31,13 +48,13 @@
 <span class="add_attachment" style="font-weight:normal;">
     <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
     <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-    <%= button_tag "浏览", :type=>"button", :onclick=>"_file.click()",:onmouseover => 'this.focus()' %>
+    <%= button_tag l(:button_browse), :type=>"button", :onclick=>"_file.click()",:onmouseover => 'this.focus()', :style => ie8? ? 'display:none' : '' %>
     <%= file_field_tag 'attachments[dummy][file]',
           :id => '_file',
           :class => 'file_selector',
           :multiple => true,
           :onchange => 'addInputFiles(this);',
-          :style => 'display:none',
+          :style => ie8? ? '' : 'display:none',
           :data => {
             :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
             :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
diff --git a/app/views/attachments/_form_course.html.erb b/app/views/attachments/_form_course.html.erb
index b2089d629..43f99056b 100644
--- a/app/views/attachments/_form_course.html.erb
+++ b/app/views/attachments/_form_course.html.erb
@@ -38,7 +38,7 @@
 <span class="add_attachment">
 <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
 <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-<%= button_tag "浏览", :type=>"button", :onclick=>"_file.click()" %>
+<%= button_tag l(:button_browse), :type=>"button", :onclick=>"_file.click()" %>
 <%= file_field_tag 'attachments[dummy][file]',
       :id => '_file',
       :class => 'file_selector',
diff --git a/app/views/attachments/destroy.js.erb b/app/views/attachments/destroy.js.erb
index 04cd4e02d..4893d22fe 100644
--- a/app/views/attachments/destroy.js.erb
+++ b/app/views/attachments/destroy.js.erb
@@ -1,7 +1,7 @@
 $('#attachments_<%= j params[:attachment_id] %>').remove();
 var count=$('#attachments_fields>span').length;
 if(count<=0){
-	$("#upload_file_count").text("未上传文件");
+	$("#upload_file_count").text(<%= l(:label_no_file_uploaded)%>);
 	$(".remove_all").remove();
 }else{
     $("#upload_file_count").html("已上传"+"<span id=\"count\">"+count+"</span>"+"个文件");
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 1d9408e86..7ddd37ad6 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -24,10 +24,6 @@
 </div>
 
 <!--display the board-->
-<div class="project_r_h">
-  <h2 class="project_h2"><%= h @board.name %></h2>
-</div>
-
 <% if !User.current.logged? %>
     <div style="font-size: 14px;margin:20px;">
       <% if @project.project_type == 1 %>
@@ -39,62 +35,52 @@
       <hr/>
     </div>
 <% end %>
-<div class="borad-setitle">
-  <span class="borad-topic-count">
-    共有
-    <%= link_to @topic_count,:controller => 'boards',:action => 'index' %>
-    个贴子
-  </span>
-  <% if @project.enabled_modules.where("name = 'boards'").count > 0 && User.current.member_of?(@project) %>
-    <span>
-        <%= link_to l(:label_message_new),
-                    new_board_message_path(@board),
-                    :class => 'icon icon-add',
-                    :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %>
-    </span>
-  <% end %>
-</div>
-<div style="width: 100%;word-break: break-all;word-wrap: break-word;">
-  <% if @topics.any? %>
-      <% @topics.each do |topic| %>
-          <table class="content-text-list">
-            <tr>
-              <td colspan="2" valign="top" width="50">
-                <%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) %>
-              </td>
-              <td>
-                <table width="640px" border="0">
-                  <tr>
-                    <td valign="top" width="500px" class=" <%= topic.sticky? ? 'sticky' : '' %>
-                    <%= topic.locked? ? 'locked' : '' %>">
-                      <%= link_to h(topic.subject.truncate(40,ommision:'...')), board_message_path(@board, topic),title:topic.subject.to_s %>
-                    </td>
-                    <td align="right" rowspan="3">
-                      <table class="borad-count">
-                        <tr>
-                          <td align="center" class="borad-count-digit"><%= link_to (topic.replies_count), board_message_path(@board, topic) %></td>
-                        </tr>
-                        <tr>
-                          <td align="center">回答</td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="left" colspan="2">
-                      <span class="font_lighter"><%= authoring topic.created_on, topic.author %><br/></span></td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-      <% end %>
-      <div class="pagination">
-        <%= pagination_links_full @topic_pages, @topic_count %>
-      </div>
+
+<!-- 内容显示部分 -->
+ <div class="project_right">
+    	<div class="project_r_h">
+        	<h2 class="project_h2"><%= h @board.name %></h2>
+        </div>
+        <div class="talk_top">
+        	<div class="fl">项目讨论区共有<span><%= @topic_count %></span>个帖子  </div>       	
+        		<% if @project.enabled_modules.where("name = 'boards'").count > 0 && User.current.member_of?(@project) %>  
+        		<span><%= link_to l(:label_message_new), new_board_message_path(@board),
+                    		  :class => 'problem_new_btn fl',                   		  
+                    		  :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %></span>
+  				<% end %>        	
+            <div class="cl"></div>
+            </div> 
+          <!-- 帖子内容显示      -->
+          <% if @topics.any? %>
+      		<% @topics.each do |topic| %>	    
+          <div class="problem_main">
+           	<a>
+           		<%= link_to image_tag(url_to_avatar(topic.author), :class => "problem_pic talk_pic fl"), user_path(topic.author) %>
+           	</a>
+      		<div class="talk_txt fl">
+      			<div>
+                	<span><%= link_to h(topic.subject), board_message_path(@board, topic), title:topic.subject.to_s, :class =>"problem_tit fl" %></span>
+                	<% if topic.sticky? %>
+                		<span class="talk_up">置顶</span>
+                	<% end %>
+                </div>
+                <div class="problem_line">
+                	<span>由<%= link_to topic.author, user_path(topic.author), :class =>"problem_name" %></span>
+                	<span>添加于<%= format_time topic.created_on %></span> 
+				</div>
+            </div>
+                	<span class="talk_btn fr">回复<%= link_to (topic.replies_count), board_message_path(@board, topic), :style =>"color:#fff;" %></span>
+                <div class="cl"></div>
+             </div><!--讨论主类容 end-->
+             <% end %>
+           <ul class="wlist">
+           	<%= pagination_links_full @topic_pages, @topic_count, :per_page_links => false, :remote => false, :flag => true %>       
+      	</ul>
   <% else %>
       <p class="nodata"><%= l(:label_no_data) %></p>
   <% end %>
+             <!--讨论主类容 end-->
+        <div class="cl"></div>
 </div>
 
 <% other_formats_links do |f| %>
diff --git a/app/views/discuss_demos/index.html.erb b/app/views/discuss_demos/index.html.erb
new file mode 100644
index 000000000..b24937357
--- /dev/null
+++ b/app/views/discuss_demos/index.html.erb
@@ -0,0 +1,25 @@
+<h1 style="">文章列表</h1>
+<div>
+  <table border="1px solid !important" >
+    <% @discuss_demo_list.each do |e| %>
+
+     <tr align="left" height="20">
+       <td width="30%" ><%= truncate(e.title,:length => 50) %></td>
+       <td align="center" width="60%">
+        <%=  truncate(e.body,:length => 50) %> &nbsp;
+       </td>
+       <td style=" margin-right: 1"  width="10%">
+         <%= link_to '查看文章',{:controller => 'discuss_demos',:action => 'show',:id=>e.id} %>
+         </td>
+       <td>
+         &nbsp;&nbsp;
+         <%= link_to '删除文章',discuss_demo_path(e.id), :method => :delete,:confirm => l(:text_are_you_sure) %>
+       </td>
+     </tr>
+        <tr height="20"></tr>
+        <tr height="20"></tr>
+    <% end %>
+  </table>
+    <% paginate @discuss_demo_list %>
+    <%= link_to '新建文章',new_discuss_demo_path %>
+</div>
\ No newline at end of file
diff --git a/app/views/discuss_demos/new.html.erb b/app/views/discuss_demos/new.html.erb
new file mode 100644
index 000000000..8cf1630e2
--- /dev/null
+++ b/app/views/discuss_demos/new.html.erb
@@ -0,0 +1,7 @@
+<%= javascript_include_tag src='/assets/kindeditor/kindeditor' %>
+<h1>新建文章</h1>
+<%= form_for @discuss_demo,:url => {:controller => 'discuss_demos',:action => "show",:id =>@discuss_demo.id, :method => :put} do |f| %>
+    <%= f.text_field :title %>
+    <%= f.kindeditor :body ,:owner_id => @discuss_demo.id%>
+    <%= f.submit :value=> '提交' %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/discuss_demos/show.html.erb b/app/views/discuss_demos/show.html.erb
new file mode 100644
index 000000000..4b6bd3cee
--- /dev/null
+++ b/app/views/discuss_demos/show.html.erb
@@ -0,0 +1,3 @@
+<h1><%= @discuss_demo.title %></h1>
+<%= textAreailizable @discuss_demo.body %>
+<%=link_to "返回首页",discuss_demos_path %>
\ No newline at end of file
diff --git a/app/views/documents/_form.html.erb b/app/views/documents/_form.html.erb
index 72361b9ab..50f47e5f7 100644
--- a/app/views/documents/_form.html.erb
+++ b/app/views/documents/_form.html.erb
@@ -11,8 +11,8 @@
 
 <%= wikitoolbar_for 'document_description' %>
 
-<% if @document.new_record? %>
+
 <div class="box tabular">
 <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form', :locals => {:container => @document} %></p>
 </div>
-<% end %>
+
diff --git a/app/views/documents/edit.html.erb b/app/views/documents/edit.html.erb
index 8a6122f8c..5c6ed2383 100644
--- a/app/views/documents/edit.html.erb
+++ b/app/views/documents/edit.html.erb
@@ -1,4 +1,6 @@
-<h3><%=l(:label_document)%></h3>
+<div class="project_r_h">
+	<h2 class="project_h2"><%=l(:label_document_plural)%></h2>
+</div>
 
 <%= labelled_form_for @document do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
diff --git a/app/views/files/_attachement_list.html.erb b/app/views/files/_attachement_list.html.erb
index 001519a28..41025e619 100644
--- a/app/views/files/_attachement_list.html.erb
+++ b/app/views/files/_attachement_list.html.erb
@@ -22,13 +22,13 @@
 </span>
 </div>
 
-<button name="button" class="f_l ml10" onclick="_file.click()" onmouseover="this.focus()" type="button" style="width:20%; height:26%;"><%= l(:label_browse)%></button>
+<button name="button" class="f_l ml10" onclick="_file.click()" onmouseover="this.focus()" type="button" style="<%= ie8? ? 'display:none' : '' %>; width:20%; height:26%;"><%= l(:label_browse)%></button>
 <%= file_field_tag 'attachments[dummy][file]',
                    :id => '_file',
                    :class => 'file_selector',
                    :multiple => true,
                    :onchange => 'addInputFiles(this);',
-                   :style => 'display:none',
+                   :style => ie8? ? '': 'display:none',
                    :data => {
                            :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
                            :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
diff --git a/app/views/files/_new.html.erb b/app/views/files/_new.html.erb
index 6e8e806cf..76aab9a73 100644
--- a/app/views/files/_new.html.erb
+++ b/app/views/files/_new.html.erb
@@ -8,10 +8,10 @@
   <table>
     <tr>
       <% if versions.any? %>
-          <td><p><%= l(:field_version) %></p></td>
+          <td><p style="padding-left: 50px;"><%= l(:field_version) %></p></td>
           <td>
             <%= select_tag "version_id", content_tag('option', '') +
-                    options_from_collection_for_select(versions, "id", "name"), {style: 'width:100px'} %>
+                    options_from_collection_for_select(versions, "id", "name"), {style: 'width:230px'} %>
           </td>
           <% if attachmenttypes.any? %>
               <td><%= l(:attachment_type) %></label></td>
@@ -31,14 +31,10 @@
             <% end %>
           </p>
       <% end %>
-
     </tr>
   </table>
-
-
+  <p style="padding-left: 54px;"> <%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form', locals: {project: project} %></p>
   </p>
-
-<p><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form', locals: {project: project} %></p>
 </div>
 <%= submit_tag l(:button_add) %>
 <% end %>
diff --git a/app/views/files/_project_file.html.erb b/app/views/files/_project_file.html.erb
index aa597f3f2..b4d849cd6 100644
--- a/app/views/files/_project_file.html.erb
+++ b/app/views/files/_project_file.html.erb
@@ -1,7 +1,7 @@
 <% attachmenttypes = @project.attachmenttypes %>
 <% sufixtypes = @project.contenttypes %>
 <div class="project_r_h">
-  <h2 class="project_h2">资源共享区</h2>
+  <h2 class="project_h2"><%= l(:lable_file_sharingarea)  %></h2>
 </div>
 
 <div class="content-title-top">
@@ -16,12 +16,12 @@
     </div>
     <div id="relation_file_div" class="relation_file_div hidden">
       <fieldset>
-        <legend>搜索</legend>
+        <legend><%= l(:label_search)%></legend>
         <%= form_tag(
                     attachments_autocomplete_path(:format => 'js'),
                     :remote => true,
                     :method => :post) do %>
-            <%= label_tag(:attach_search, "按关键字搜索:") %>
+            <%= label_tag(:attach_search, l(:label_search_by_keyword)) %>
             <%= text_field_tag(:attach_search) %>
             <%#= submit_tag("Search") %>
         <% end -%>
diff --git a/app/views/files/_show_all_attachment.html.erb b/app/views/files/_show_all_attachment.html.erb
index c32280c2c..6935c186f 100644
--- a/app/views/files/_show_all_attachment.html.erb
+++ b/app/views/files/_show_all_attachment.html.erb
@@ -16,8 +16,8 @@
   <tr>
     <%= sort_header_tag('filename', :caption => l(:field_filename), :scope => "col", :id => "vzebra-adventure",:class => "tableth") %>
     <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children",:class => "tableth") %>
-    <%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype",:class => "tableth") %>
-    <%= content_tag('th', l(:attachment_sufix_browse), id: 'vzebra-contenttype', class: 'tableth', style: 'color: black')%>
+    <%= sort_header_tag('attach_type', :caption => l(:field_filecontenttype), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype",:class => "tableth") %>
+    <%= content_tag('th', l(:field_filetype), id: 'vzebra-contenttype', class: 'tableth', style: 'color: black')%>
     <%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense",:class => "tableth") %>
     <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action",:class => "tableth") %>
     <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children",:class => "tableth") %>
@@ -73,7 +73,7 @@
                 <div class="tags_gradint"></div>
               </div>
               <div class="read-more hidden">
-                <a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
+                <a href="javascript:void(0);" onclick="readmore(this);"> <%= l(:button_more)%> </a>
               </div>
             </td>
           </tr>
diff --git a/app/views/files/_sort_by_attachtypel.html.erb b/app/views/files/_sort_by_attachtypel.html.erb
index 5faa73b0f..27aaf2f3d 100644
--- a/app/views/files/_sort_by_attachtypel.html.erb
+++ b/app/views/files/_sort_by_attachtypel.html.erb
@@ -15,8 +15,8 @@
   <tr>
     <%= sort_header_tag('filename', :caption => l(:field_filename), :scope => "col", :id => "vzebra-adventure" ,:class => "tableth") %>
     <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children",:class => "tableth") %>
-    <%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype",:class => "tableth") %>
-    <%= content_tag('th', l(:attachment_sufix_browse), id: 'vzebra-contenttype', class: 'tableth', style: 'color: black')%>
+    <%= sort_header_tag('attach_type', :caption => l(:field_filecontenttype), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype",:class => "tableth") %>
+    <%= content_tag('th', l(:field_filetype), id: 'vzebra-contenttype', class: 'tableth', style: 'color: black')%>
     <%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense",:class => "tableth") %>
     <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action",:class => "tableth") %>
     <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children",:class => "tableth") %>
@@ -76,7 +76,7 @@
                     <div class="tags_gradint"></div>
                   </div>
                   <div class="read-more hidden">
-                    <a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
+                    <a href="javascript:void(0);" onclick="readmore(this);"> <%= l(:button_more)%>  </a>
                   </div>
                 </td>
               </tr>
diff --git a/app/views/files/_upload_show.html.erb b/app/views/files/_upload_show.html.erb
index 91d050d93..70465c21e 100644
--- a/app/views/files/_upload_show.html.erb
+++ b/app/views/files/_upload_show.html.erb
@@ -4,7 +4,8 @@
     <div class="upload_box">
       <%= error_messages_for 'attachment' %>
       <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
-      <%= form_tag(course_files_path(course), :multipart => true,:remote => true,:method => :post,:name=>"upload_form") do %>
+
+      <%= form_tag(course_files_path(course), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
           <!-- <label style="margin-top:3px;"><#%= l(:label_file_upload)%></label>   -->
           <%= render :partial => 'attachement_list',:locals => {:course => course} %>
           <div class="cl"></div>
diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb
index 61cea920c..bcd7b30c5 100644
--- a/app/views/issues/_action_menu.html.erb
+++ b/app/views/issues/_action_menu.html.erb
@@ -12,7 +12,7 @@
 
 <% end %>
 
-<%= watcher_link(@issue, User.current) %>
+
 <%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:add_issues, @project) %>
 <%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'icon icon-del' if User.current.allowed_to?(:delete_issues, @project) %>
 </div>
diff --git a/app/views/issues/_newissue_index.html.erb b/app/views/issues/_newissue_index.html.erb
deleted file mode 100644
index 4b282aa8f..000000000
--- a/app/views/issues/_newissue_index.html.erb
+++ /dev/null
@@ -1,139 +0,0 @@
-<div class="project_r_h">
-  <h2 class="project_h2">问题跟踪</h2>
-</div>
-<div class="problem_top">
-  <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
-      <span>
-        <% if User.current.member_of?(@project) %>
-            <%= link_to l(:label_issue_new), {:controller => 'issues', :action => 'new', :copy_from => nil}, :param => :project_id, :caption => :label_issue_new,
-                    :html => {:accesskey => Redmine::AccessKeys.key_for(:new_issue)}, :class => 'icon icon-add' %>
-         <% end %>
-        <%= link_to l(:label_query), '#', :class => 'icon icon-help',
-                    :onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %>
-      </span>
-  <% end %>
-  <span class="problem_p fr">问题总数：<span><%= @project.issues.count %></span> 未解决：<span><%= @project.issues.where('status_id in (1,2,4,6)').count  %></span></span>
-</div>
-<div class="contextual">
-  <% if !@query.new_record? && @query.editable_by?(User.current) %>
-      <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
-      <%= delete_link query_path(@query) %>
-  <% end %>
-</div>
-
-<% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
-<div style="clear:right; ">
-  <%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get, :id => 'query_form', :class => 'query_form') do %>
-      <%= hidden_field_tag 'set_filter', '1' %>
-
-      <div id="custom_query" class="custom_query" style="display: <%= !params[:utf8].blank? ? 'block' : 'none' %>;">
-        <span>---<%= l :label_query_new %>---</span>
-
-        <div id="query_form_content" class="hide-when-print">
-          <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
-            <legend onclick="toggleFieldset(this);">
-              <%= l(:label_issue_query_condition) %>
-            </legend>
-            <div style="<%= @query.new_record? ? "" : "display: none;" %>">
-              <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
-            </div>
-          </fieldset>
-          <!--
-          <fieldset class="collapsible collapsed">
-            <legend onclick="toggleFieldset(this);">
-              <%= l(:label_options) %>
-            </legend>
-            <div style="display: none;">
-              <table>
-                <tr>
-                  <td><%= l(:field_column_names) %></td>
-                  <td><%= render_query_columns_selection(@query) %></td>
-                </tr>
-                <tr>
-                  <td><label for='group_by'><%= l(:field_group_by) %></label></td>
-                  <td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect { |c| [c.caption, c.name.to_s] }, @query.group_by)) %></td>
-                </tr>
-                <tr>
-                  <td><%= l(:button_show) %></td>
-                  <td><%= available_block_columns_tags(@query) %></td>
-                </tr>
-              </table>
-            </div>
-          </fieldset>
-           -->
-          <div class="buttons hide-when-print">
-            <%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
-            <%= link_to l(:label_issue_cancel_query), {:set_filter => 1, :project_id => @project}, :class => 'icon icon-reload' %>
-          </div>
-        </div>
-      </div>
-  <% end %>
-</div>
-
-<%= error_messages_for 'query' %>
-
-<% if @query.valid? %>
-    <% if @issues.empty? %>
-        <p class="nodata">
-          <%= l(:label_no_data) %>
-        </p>
-    <% else %>
-        <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
-        <div class="pagination">
-          <ul><%= pagination_links_full @issue_pages, @issue_count %></ul>
-        </div>
-    <% end %>
-    <div style="float: right; padding-top: 30px">
-      <% other_formats_links do |f| %>
-          <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
-          <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
-          <%= f.link_to 'PDF', :url => params %>
-      <% end %>
-    </div>
-
-
-    <div id="csv-export-options" style="display:none;">
-      <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
-      <%= form_tag(params.merge({:format => 'csv', :page => nil}), :method => :get, :id => 'csv-export-form') do %>
-          <p>
-            <label>
-              <%= radio_button_tag 'columns', 'all' %>
-              <%= l(:description_all_columns) %>
-            </label>
-          </p>
-
-          <p>
-            <label>
-              <%= check_box_tag 'description', '1', @query.has_column?(:description) %>
-              <%= l(:field_description) %>
-            </label>
-          </p>
-
-          <p class="buttons">
-            <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
-            <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
-          </p>
-      <% end %>
-    </div>
-
-<% end %>
-
-<%= call_hook(:view_issues_index_bottom, {:issues => @issues, :project => @project, :query => @query}) %>
-
-<% content_for :sidebar do %>
-    <%= render :partial => 'issues/sidebar' %>
-<% end %>
-
-<% content_for :header_tags do %>
-    <%= auto_discovery_link_tag(:atom,
-                                {:query_id => @query, :format => 'atom',
-                                 :page => nil, :key => User.current.rss_key},
-                                :title => l(:label_issue_plural)) %>
-    <%= auto_discovery_link_tag(:atom,
-                                {:controller => 'journals', :action => 'index',
-                                 :query_id => @query, :format => 'atom',
-                                 :page => nil, :key => User.current.rss_key},
-                                :title => l(:label_changes_details)) %>
-<% end %>
-
-<%= context_menu issues_context_menu_path %>
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index b3750a770..4b282aa8f 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1 +1,139 @@
-<%= render :partial => 'issues/newissue_index' %>
\ No newline at end of file
+<div class="project_r_h">
+  <h2 class="project_h2">问题跟踪</h2>
+</div>
+<div class="problem_top">
+  <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
+      <span>
+        <% if User.current.member_of?(@project) %>
+            <%= link_to l(:label_issue_new), {:controller => 'issues', :action => 'new', :copy_from => nil}, :param => :project_id, :caption => :label_issue_new,
+                    :html => {:accesskey => Redmine::AccessKeys.key_for(:new_issue)}, :class => 'icon icon-add' %>
+         <% end %>
+        <%= link_to l(:label_query), '#', :class => 'icon icon-help',
+                    :onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %>
+      </span>
+  <% end %>
+  <span class="problem_p fr">问题总数：<span><%= @project.issues.count %></span> 未解决：<span><%= @project.issues.where('status_id in (1,2,4,6)').count  %></span></span>
+</div>
+<div class="contextual">
+  <% if !@query.new_record? && @query.editable_by?(User.current) %>
+      <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
+      <%= delete_link query_path(@query) %>
+  <% end %>
+</div>
+
+<% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
+<div style="clear:right; ">
+  <%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get, :id => 'query_form', :class => 'query_form') do %>
+      <%= hidden_field_tag 'set_filter', '1' %>
+
+      <div id="custom_query" class="custom_query" style="display: <%= !params[:utf8].blank? ? 'block' : 'none' %>;">
+        <span>---<%= l :label_query_new %>---</span>
+
+        <div id="query_form_content" class="hide-when-print">
+          <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
+            <legend onclick="toggleFieldset(this);">
+              <%= l(:label_issue_query_condition) %>
+            </legend>
+            <div style="<%= @query.new_record? ? "" : "display: none;" %>">
+              <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
+            </div>
+          </fieldset>
+          <!--
+          <fieldset class="collapsible collapsed">
+            <legend onclick="toggleFieldset(this);">
+              <%= l(:label_options) %>
+            </legend>
+            <div style="display: none;">
+              <table>
+                <tr>
+                  <td><%= l(:field_column_names) %></td>
+                  <td><%= render_query_columns_selection(@query) %></td>
+                </tr>
+                <tr>
+                  <td><label for='group_by'><%= l(:field_group_by) %></label></td>
+                  <td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect { |c| [c.caption, c.name.to_s] }, @query.group_by)) %></td>
+                </tr>
+                <tr>
+                  <td><%= l(:button_show) %></td>
+                  <td><%= available_block_columns_tags(@query) %></td>
+                </tr>
+              </table>
+            </div>
+          </fieldset>
+           -->
+          <div class="buttons hide-when-print">
+            <%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
+            <%= link_to l(:label_issue_cancel_query), {:set_filter => 1, :project_id => @project}, :class => 'icon icon-reload' %>
+          </div>
+        </div>
+      </div>
+  <% end %>
+</div>
+
+<%= error_messages_for 'query' %>
+
+<% if @query.valid? %>
+    <% if @issues.empty? %>
+        <p class="nodata">
+          <%= l(:label_no_data) %>
+        </p>
+    <% else %>
+        <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
+        <div class="pagination">
+          <ul><%= pagination_links_full @issue_pages, @issue_count %></ul>
+        </div>
+    <% end %>
+    <div style="float: right; padding-top: 30px">
+      <% other_formats_links do |f| %>
+          <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
+          <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
+          <%= f.link_to 'PDF', :url => params %>
+      <% end %>
+    </div>
+
+
+    <div id="csv-export-options" style="display:none;">
+      <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
+      <%= form_tag(params.merge({:format => 'csv', :page => nil}), :method => :get, :id => 'csv-export-form') do %>
+          <p>
+            <label>
+              <%= radio_button_tag 'columns', 'all' %>
+              <%= l(:description_all_columns) %>
+            </label>
+          </p>
+
+          <p>
+            <label>
+              <%= check_box_tag 'description', '1', @query.has_column?(:description) %>
+              <%= l(:field_description) %>
+            </label>
+          </p>
+
+          <p class="buttons">
+            <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
+            <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
+          </p>
+      <% end %>
+    </div>
+
+<% end %>
+
+<%= call_hook(:view_issues_index_bottom, {:issues => @issues, :project => @project, :query => @query}) %>
+
+<% content_for :sidebar do %>
+    <%= render :partial => 'issues/sidebar' %>
+<% end %>
+
+<% content_for :header_tags do %>
+    <%= auto_discovery_link_tag(:atom,
+                                {:query_id => @query, :format => 'atom',
+                                 :page => nil, :key => User.current.rss_key},
+                                :title => l(:label_issue_plural)) %>
+    <%= auto_discovery_link_tag(:atom,
+                                {:controller => 'journals', :action => 'index',
+                                 :query_id => @query, :format => 'atom',
+                                 :page => nil, :key => User.current.rss_key},
+                                :title => l(:label_changes_details)) %>
+<% end %>
+
+<%= context_menu issues_context_menu_path %>
diff --git a/app/views/issues/index.js.erb b/app/views/issues/index.js.erb
deleted file mode 100644
index 866882053..000000000
--- a/app/views/issues/index.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-$('#content').html('<%= escape_javascript(render :partial => 'issues/newissue_index') %>');
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 69abf79a6..38afc672d 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,181 +1,181 @@
-<div class="project_r_h">
-  <h2 class="project_h2"><%= l(:label_issue_plural) %></h2>
-</div>
-<%# html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
-<% html_title "#{@issue.tracker.name} #{@issue.source_from}'#'#{@issue.project_index}: #{@issue.subject}" %>
-
-<%= render :partial => 'action_menu' %>
-
-<h3>
-  <%= issue_heading(@issue) %>
-</h3>
-
-<style type="text/css"></style>
-
-<div class="<%= @issue.css_classes %> details">
-  <% if @prev_issue_id || @next_issue_id %>
-    <div class="next-prev-links contextual">
-      <%= link_to_if @prev_issue_id,
-                     "\xc2\xab #{l(:label_previous)}",
-                     (@prev_issue_id ? issue_path(Issue.find_by_id(@prev_issue_id)) : nil),
-                     :title => "##{@prev_issue_id}" %> |
-      <% if @issue_position && @issue_count %>
-        <span class="position"><%= l(:label_item_position, :position => @issue_position, :count => @issue_count) %></span> |
-      <% end %>
-      <%= link_to_if @next_issue_id,
-                     "#{l(:label_next)} \xc2\xbb",
-                     (@next_issue_id ? issue_path(Issue.find_by_id(@next_issue_id)) : nil),
-                     :title => "##{@next_issue_id}" %>
-    </div>
-  <% end %>
-
-  <!-- <%#= avatar(@issue.author, :size => "50") %> -->
-
-<div class="subject"  style="word-wrap: break-word;">
-<%= render_issue_subject_with_tree(@issue) %>
-</div> 
-
-<!-- 顶和踩  在这里添加  -->
- <span id="praise_tread" style="float: right">
-       <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @issue,:show_flag => true,:user_id =>User.current.id,:horizontal => false}%>
-  </span>
-
-        <p class="author">
-        <%= authoring @issue.created_on, @issue.author %>.
-        <% if @issue.created_on != @issue.updated_on %>
-        <%= l(:label_updated_time, time_tag(@issue.updated_on)).html_safe %>.
-        <% end %>  
-        </p>
-        <!-- added by william -for tag -->
-	<div id="tags">
-		<%= render :partial => 'tags/tag', :locals => {:obj => @issue,:object_flag => "3" }%>
-	</div>
-<table class="attributes">
-<%= issue_fields_rows do |rows|
-  rows.left l(:field_status), h(@issue.status.name), :class => 'status'
-  rows.left l(:field_priority), h(@issue.priority.name), :class => 'priority'
-
-  unless @issue.disabled_core_fields.include?('assigned_to_id')
-  #modified by nie
-  #modified by huang
-    rows.left l(:field_assigned_to), (image_tag url_to_avatar(@issue.assigned_to(@user)), :class => 'avatar').to_s.html_safe + (@issue.assigned_to ? link_to_user(@issue.assigned_to) : "-"), :class => 'assigned-to'
-  end
-  # end huang
-  unless @issue.disabled_core_fields.include?('category_id')
-    rows.left l(:field_category), h(@issue.category ? @issue.category.name : "-"), :class => 'category'
-  end
-  unless @issue.disabled_core_fields.include?('fixed_version_id')
-    rows.left l(:field_fixed_version), (@issue.fixed_version ? link_to_version(@issue.fixed_version) : "-"), :class => 'fixed-version'
-  end
-
-  unless @issue.disabled_core_fields.include?('start_date')
-    rows.right l(:field_start_date), format_date(@issue.start_date), :class => 'start-date'
-  end
-  unless @issue.disabled_core_fields.include?('due_date')
-    rows.right l(:field_due_date), format_date(@issue.due_date), :class => 'due-date'
-  end
-  unless @issue.disabled_core_fields.include?('done_ratio')
-    rows.right l(:field_done_ratio), progress_bar(@issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%"), :class => 'progress'
-  end
-  unless @issue.disabled_core_fields.include?('estimated_hours')
-    unless @issue.estimated_hours.nil?
-      rows.right l(:field_estimated_hours), l_hours(@issue.estimated_hours), :class => 'estimated-hours'
-    end
-  end
-  if User.current.allowed_to?(:view_time_entries, @project)
-    rows.right l(:label_spent_time), (@issue.total_spent_hours > 0 ? link_to(l_hours(@issue.total_spent_hours), project_issue_time_entries_path(@project, @issue)) : "-"), :class => 'spent-time'
-  end
-end %>
-<%= render_custom_fields_rows(@issue) %>
-<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
-</table>
-woca
-<% if @issue.description? || @issue.attachments.any? -%>
-<hr />
-<% if @issue.description? %>
-<div class="description">
-  <div class="contextual">
-  <%= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
-  </div>
-
-  <p><strong><%=l(:field_description)%></strong></p>
-  <div class="wiki">
-  <%= textilizable @issue, :description, :attachments => @issue.attachments %>
-  </div>
-</div>
-<% end %>
-<%= link_to_attachments @issue, :thumbnails => true %>
-<% end -%>
-
-<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
-
-<% if false # !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
-<hr />
-
-<div id="issue_tree">
-<div class="contextual">
-  <%= link_to_new_subtask(@issue) if User.current.allowed_to?(:manage_subtasks, @project) %>
-</div>
-
-<p><strong><%=l(:label_subtask_plural)%></strong></p>
-<%= render_descendants_tree(@issue) unless @issue.leaf? %>
-</div>
-<% end %>
-
-<% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
-<hr />
-<div id="relations">
-<%= render :partial => 'relations' %>
-</div>
-<% end %>
-
-</div>
-
-<% if @changesets.present? %>
-<div id="issue-changesets">
-<h3><%=l(:label_associated_revisions)%></h3>
-<%= render :partial => 'changesets', :locals => { :changesets => @changesets} %>
-</div>
-<% end %>
-
-<% if @journals.present? %>
-<div id="history">
-<h3><%=l(:label_history)%></h3>
-<%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
-</div>
-<% end %>
-
-
-<div style="clear: both;"></div>
-<%= render :partial => 'action_menu' %>
-
-<div style="clear: both;"></div>
-<% if @issue.editable? %>
-  <div id="update">
-  <h3><%= l(:button_update) %></h3>
-  <%= render :partial => 'edit' %>
-  </div>
-<% end %>
-
-<% other_formats_links do |f| %>
-  <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
-  <%= f.link_to 'PDF' %>
-<% end %>
-
-
-<% content_for :sidebar do %>
-  <%= render :partial => 'issues/sidebar' %>
-
-  <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
-    (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
-    <div id="watchers">
-      <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
-    </div>
-  <% end %>
-<% end %>
-
-<% content_for :header_tags do %>
-    <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
-<% end %>
-
-<%= context_menu issues_context_menu_path %>
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_issue_plural) %></h2>
+</div>
+<%# html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
+<% html_title "#{@issue.tracker.name} #{@issue.source_from}'#'#{@issue.project_index}: #{@issue.subject}" %>
+
+<%= render :partial => 'action_menu' %>
+
+<h3>
+  <%= issue_heading(@issue) %>
+</h3>
+
+<style type="text/css"></style>
+
+<div class="<%= @issue.css_classes %> details">
+  <% if @prev_issue_id || @next_issue_id %>
+    <div class="next-prev-links contextual">
+      <%= link_to_if @prev_issue_id,
+                     "\xc2\xab #{l(:label_previous)}",
+                     (@prev_issue_id ? issue_path(Issue.find_by_id(@prev_issue_id)) : nil),
+                     :title => "##{@prev_issue_id}" %> |
+      <% if @issue_position && @issue_count %>
+        <span class="position"><%= l(:label_item_position, :position => @issue_position, :count => @issue_count) %></span> |
+      <% end %>
+      <%= link_to_if @next_issue_id,
+                     "#{l(:label_next)} \xc2\xbb",
+                     (@next_issue_id ? issue_path(Issue.find_by_id(@next_issue_id)) : nil),
+                     :title => "##{@next_issue_id}" %>
+    </div>
+  <% end %>
+
+  <!-- <%#= avatar(@issue.author, :size => "50") %> -->
+
+<div class="subject"  style="word-wrap: break-word;">
+<%= render_issue_subject_with_tree(@issue) %>
+</div> 
+
+<!-- 顶和踩  在这里添加  -->
+ <span id="praise_tread" style="float: right">
+       <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @issue,:show_flag => true,:user_id =>User.current.id,:horizontal => false}%>
+  </span>
+
+        <p class="author">
+        <%= authoring @issue.created_on, @issue.author %>.
+        <% if @issue.created_on != @issue.updated_on %>
+        <%= l(:label_updated_time, time_tag(@issue.updated_on)).html_safe %>.
+        <% end %>  
+        </p>
+        <!-- added by william -for tag -->
+	<div id="tags">
+		<%= render :partial => 'tags/tag', :locals => {:obj => @issue,:object_flag => "3" }%>
+	</div>
+<table class="attributes">
+<%= issue_fields_rows do |rows|
+  rows.left l(:field_status), h(@issue.status.name), :class => 'status'
+  rows.left l(:field_priority), h(@issue.priority.name), :class => 'priority'
+
+  unless @issue.disabled_core_fields.include?('assigned_to_id')
+  #modified by nie
+  #modified by huang
+    rows.left l(:field_assigned_to), (image_tag url_to_avatar(@issue.assigned_to(@user)), :class => 'avatar').to_s.html_safe + (@issue.assigned_to ? link_to_user(@issue.assigned_to) : "-"), :class => 'assigned-to'
+  end
+  # end huang
+  unless @issue.disabled_core_fields.include?('category_id')
+    rows.left l(:field_category), h(@issue.category ? @issue.category.name : "-"), :class => 'category'
+  end
+  unless @issue.disabled_core_fields.include?('fixed_version_id')
+    rows.left l(:field_fixed_version), (@issue.fixed_version ? link_to_version(@issue.fixed_version) : "-"), :class => 'fixed-version'
+  end
+
+  unless @issue.disabled_core_fields.include?('start_date')
+    rows.right l(:field_start_date), format_date(@issue.start_date), :class => 'start-date'
+  end
+  unless @issue.disabled_core_fields.include?('due_date')
+    rows.right l(:field_due_date), format_date(@issue.due_date), :class => 'due-date'
+  end
+  unless @issue.disabled_core_fields.include?('done_ratio')
+    rows.right l(:field_done_ratio), progress_bar(@issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%"), :class => 'progress'
+  end
+  unless @issue.disabled_core_fields.include?('estimated_hours')
+    unless @issue.estimated_hours.nil?
+      rows.right l(:field_estimated_hours), l_hours(@issue.estimated_hours), :class => 'estimated-hours'
+    end
+  end
+  if User.current.allowed_to?(:view_time_entries, @project)
+    rows.right l(:label_spent_time), (@issue.total_spent_hours > 0 ? link_to(l_hours(@issue.total_spent_hours), project_issue_time_entries_path(@project, @issue)) : "-"), :class => 'spent-time'
+  end
+end %>
+<%= render_custom_fields_rows(@issue) %>
+<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
+</table>
+
+<% if @issue.description? || @issue.attachments.any? -%>
+<hr />
+<% if @issue.description? %>
+<div class="description">
+  <div class="contextual">
+  <%= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
+  </div>
+
+  <p><strong><%=l(:field_description)%></strong></p>
+  <div class="wiki">
+  <%= textilizable @issue, :description, :attachments => @issue.attachments %>
+  </div>
+</div>
+<% end %>
+<%= link_to_attachments @issue, :thumbnails => true %>
+<% end -%>
+
+<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
+
+<% if false # !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
+<hr />
+
+<div id="issue_tree">
+<div class="contextual">
+  <%= link_to_new_subtask(@issue) if User.current.allowed_to?(:manage_subtasks, @project) %>
+</div>
+
+<p><strong><%=l(:label_subtask_plural)%></strong></p>
+<%= render_descendants_tree(@issue) unless @issue.leaf? %>
+</div>
+<% end %>
+
+<% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
+<hr />
+<div id="relations">
+<%= render :partial => 'relations' %>
+</div>
+<% end %>
+
+</div>
+
+<% if @changesets.present? %>
+<div id="issue-changesets">
+<h3><%=l(:label_associated_revisions)%></h3>
+<%= render :partial => 'changesets', :locals => { :changesets => @changesets} %>
+</div>
+<% end %>
+
+<% if @journals.present? %>
+<div id="history">
+<h3><%=l(:label_history)%></h3>
+<%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
+</div>
+<% end %>
+
+
+<div style="clear: both;"></div>
+<%= render :partial => 'action_menu' %>
+
+<div style="clear: both;"></div>
+<% if @issue.editable? %>
+  <div id="update">
+  <h3><%= l(:button_update) %></h3>
+  <%= render :partial => 'edit' %>
+  </div>
+<% end %>
+
+<% other_formats_links do |f| %>
+  <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+  <%= f.link_to 'PDF' %>
+<% end %>
+
+
+<% content_for :sidebar do %>
+  <%= render :partial => 'issues/sidebar' %>
+
+  <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
+    (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
+    <div id="watchers">
+      <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
+    </div>
+  <% end %>
+<% end %>
+
+<% content_for :header_tags do %>
+    <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
+<% end %>
+
+<%= context_menu issues_context_menu_path %>
diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb
index a11defebf..42a7eccd1 100644
--- a/app/views/layouts/base_contest.html.erb
+++ b/app/views/layouts/base_contest.html.erb
@@ -194,7 +194,7 @@
                                             </strong>
 											<% if show_more_fans?(@bid) %>
 											   <span style="display:inline-block; font-size: 12px; float:right; margin-bottom: -4px;">
-                                                 <%= link_to l(:label_more), :controller => 'bids', :action => 'show_bid_user'%>
+                                                 <%= link_to l(:button_more), :controller => 'bids', :action => 'show_bid_user'%>
                                                </span>
 											<% end %>
 										</div>
@@ -217,7 +217,7 @@
                                             </strong>
 											<% if show_more_bid_project?(@bid) %>
 											   <span style="display:inline-block; font-size: 12px; float:right; margin-bottom: -4px;">
-                                                 <%= link_to l(:label_more), :controller => 'bids', :action => 'show_project'%>
+                                                 <%= link_to l(:button_more), :controller => 'bids', :action => 'show_project'%>
                                                </span>
 											<% end %>
 										</div>
@@ -244,7 +244,7 @@
                                             </strong>
 											<% if show_more_participate?(@bid) %>
 											<span  style="font-size: 12px; display: inline; float: right;" >
-												<%= link_to l(:label_more), :controller => "bids", :action => "show_participator"%>
+												<%= link_to l(:button_more), :controller => "bids", :action => "show_participator"%>
 											</span>
 											<% end %>
 										</div>
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index f3c598598..26015d536 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -215,7 +215,7 @@
                                               <%= l(:label_x_followers, :count => @contest.watcher_users.count) %>
                                             </strong>
 											 <% if show_more_fans?(@contest) %>
-											   <span style="display:inline-block; font-size: 12px; float:right; margin-bottom: -4px;"><%= link_to l(:label_more), show_contest_user_contest_path(@contest) %></span>
+											   <span style="display:inline-block; font-size: 12px; float:right; margin-bottom: -4px;"><%= link_to l(:button_more), show_contest_user_contest_path(@contest) %></span>
 											<% end %>
 										</div>
 										<div class="left_wf">
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 3098a5cda..9c999aa05 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -93,7 +93,7 @@
 										<%= image_tag(url_to_avatar(@project), :style => 'width:61px; height:61px;') %>
 									</div>
 									<div class="pr_info_id fl mb5">
-										ID:<%= @project.id %>
+										<%= l(:label_project_id)%><%= @project.id %>
 									</div>
 									<!--关注、申请加入/退出项目-->
 									<div id="join_exit_project_div">
@@ -126,7 +126,9 @@
 										<%= link_to "#{@project.watcher_users.count}", {:controller=>"projects", :action=>"watcherlist", :id => @project.id}, :style => "color:#3CA5C6;font-weight:bold"  %></span>）
 										<span>| </span>
 										<%= l(:project_module_attachments) %>（<span class="info_foot_num" >
-										<%= link_to "#{@project.attachments.count}", project_files_path(@project), :style => "color:#3CA5C6;font-weight:bold" %></a>）</div>
+                                        <% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count  %>
+										<%= link_to "#{attaments_num}", project_files_path(@project), :style => "color:#3CA5C6;font-weight:bold" %></span>）
+									 </div>
 										<div class="cl"></div>
 									</div><!--项目信息 end-->
 
@@ -168,9 +170,9 @@
                                       	<% end%>
                                       	<% unless @project.enabled_modules.where("name = 'files'").empty? %>
 										<div class="subNav">
-											<%= link_to l(:label_course_file), project_files_path(@project), :style => "color:#3CA5C6" %>
-											<% unless @project.attachments.count == 0 %>
-												<span  class="subnav_num">(<%= @project.attachments.count  %>)</span>
+											<%= link_to l(:project_module_files), project_files_path(@project), :style => "color:#3CA5C6" %>
+											<% unless attaments_num == 0 %>
+												<span  class="subnav_num">(<%= attaments_num  %>)</span>
 											<% end %>
                                             <% if User.current.member_of?(@project) %>
                                                 <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:16px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %>
@@ -187,7 +189,7 @@
 										</div>
                                       	<% end %>
 
-										<div class="subNav subNav_jiantou"><%= l(:label_more) %></div>
+										<div class="subNav subNav_jiantou"><%= l(:label_project_more) %></div>
 										<ul class="navContent" style="padding-left: 0px">
 											<%= render 'projects/tools_expand' %>
 										</ul>
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index d68e6abe5..213c9ed07 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -258,10 +258,10 @@
                                                 <% else %>
                                                       <tr>
                                                         <td style=" float: right" width="70px" >
-                                                          <%= l(:label_identity)%>：
+                                                          <span style="float: right"><%= l(:label_identity)%>：</span>
                                                         </td>
                                                         <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
-                                                          <%= l(:label_account_student) %>
+                                                          <%= l(:label_account_identity_student) %>
                                                         </td>
                                                       </tr>
 
@@ -269,10 +269,10 @@
 											<% elsif @user.user_extensions.identity == 3 %>
                                                 <tr>
                                                   <td style=" float: right" width="70px" >
-                                                    <%= l(:label_identity)%>：
+                                                     <span style="float: right"><%= l(:label_identity)%>：</span>
                                                   </td>
                                                   <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
-                                                    <%= l(:label_account_developer) %>
+                                                    <%= l(:label_account_identity_developer) %>
                                                   </td>
                                                 </tr>
                                             <% end %>
@@ -295,7 +295,7 @@
                                             </strong>
 											<% if show_more_watchers?(@user) %>
 											<div  style="font-size: 11px; display: inline; float: right; margin-top: 5px; margin-right: 20px" >
-												<%= link_to l(:label_more), :controller => "users", :action => "user_watchlist"%>
+												<%= link_to l(:button_more), :controller => "users", :action => "user_watchlist"%>
 											</div>
 											<% end %>
 										</div>
@@ -319,7 +319,7 @@
                                             </strong>
 											<% if show_more_fans?(@user) %>
 											<div  style="font-size: 11px; display: inline; float: right; margin-top: 5px; margin-right: 20px" >
-												<%= link_to l(:label_more), :controller => "users", :action => "user_fanslist"%>
+												<%= link_to l(:button_more), :controller => "users", :action => "user_fanslist"%>
 											</div>
 											<% end %>
 										</div>
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index c5be3f4fd..c24ab84e7 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -41,7 +41,8 @@ a:hover.mail_reply{ background:#06a9bc; text-decoration:none;}
  <div class="container" style="margin:0; padding:0; border:0;">
 	<div class="mail" style="width:600px; margin:20px; height:auto; color:#4b4b4b; font-size:14px; margin:0; padding:0; border:0;">
     	<div class="mail_head" style="margin:0; padding:0; border:0;">
-        	<p><%= l(:mail_issue_greetings)%></p>
+
+
         </div><!--mail_head end-->
         <%= yield %>
        </div>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index b0a593180..01465188c 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -57,6 +57,9 @@
 </style>
 
 <div class="lz">
+  <div class="project_r_h">
+        	<h2 class="project_h2"><%= h @board.name %></h2>
+  </div>
   <!-- 在这里添加赞和踩-->
   <span id="praise_tread" style="float: right">
     <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @topic,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
diff --git a/app/views/news/_form.html.erb b/app/views/news/_form.html.erb
index 5e5cdf532..024360597 100644
--- a/app/views/news/_form.html.erb
+++ b/app/views/news/_form.html.erb
@@ -1,4 +1,4 @@
-<%= error_messages_for @news %>
+.<%= error_messages_for @news %>
 <div class="add_frame_header" >
 	<%= @project ? l(:label_news_new) : l(:bale_news_notice) %>
 </div>
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index 874e89e1f..bde061f31 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -72,9 +72,9 @@
                             :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
           <%= render :partial => 'form', :locals => { :f => f } %>
           <%#= submit_tag l(:button_save) %>
-          <%= link_to l(:button_save), "#", :onclick => 'submitNews();',:onmouseover => 'this.focus()',:class => 'whiteButton m3p10' %>
+          <%= link_to l(:button_save), "#", :onclick => 'submitNews();',:onmouseover => 'this.focus()',:class => 'ButtonColor m3p10' %>
           <%#= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form',target='preview',{:class => 'whiteButton m3p10'} %>
-          <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'whiteButton m3p10' %>
+          <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'ButtonColor m3p10'%>
       <% end %>
       <div id="preview" class="wiki"></div>
     </div>
diff --git a/app/views/projects/_member_list.html.erb b/app/views/projects/_member_list.html.erb
index 09173b835..ca42e1c86 100644
--- a/app/views/projects/_member_list.html.erb
+++ b/app/views/projects/_member_list.html.erb
@@ -3,7 +3,7 @@
 	<div class="well">
 		<% next if member.new_record?  %>
 		<% unless member.created_on.nil?  %>
-			<%= content_tag "p", "#{format_date(member.created_on)}#{l(:label_member_since)}", :class => "float_right member_since" %>
+			<%= content_tag "p", (User.current.language == ""|| User.current.language == "zh")?("#{format_date(member.created_on)}"+" "+"#{l(:label_member_since)}"):("#{l(:label_member_since)}"+" "+"#{format_date(member.created_on)}"), :class => "float_right member_since" %>
 		<% end %>
 		<%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :class => 'avatar'))  %>
 		<%= content_tag "div", link_to(member.user.name, user_path(member.user)), :class => "nomargin avatar_name" %>
diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb
index b6e5f8c0d..f62b0822a 100644
--- a/app/views/projects/_tools_expand.html.erb
+++ b/app/views/projects/_tools_expand.html.erb
@@ -42,7 +42,7 @@
 </li>
 <li>
   <% unless @project.enabled_modules.where("name = 'dts'").empty? %>
-	<%= link_to l(:label_module_share) ,share_show_path(@project) %>
+	<%= link_to l(:project_module_dts) ,share_show_path(@project) %>
   <% end %>
 </li>
 
diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index 63f69e120..c222bece1 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -45,6 +45,7 @@
 	</div>
 	<div class="cl"></div>
 	<div class="box_main">
+		<div style="padding-left: 20px;">
 		<h3 class="box_h3"><%= l(:label_invite_new_user)%></h3>
 		<p class="box_p">
 			<%= l(:label_invite_email_tips)%>
@@ -62,5 +63,6 @@
                 </a>
 				<%#= submit_tag '免费发送', :style => "display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;" %>
 			<% end %>
+		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/app/views/projects/watcherlist.html.erb b/app/views/projects/watcherlist.html.erb
index 1acefe092..0a7a222d4 100644
--- a/app/views/projects/watcherlist.html.erb
+++ b/app/views/projects/watcherlist.html.erb
@@ -17,7 +17,7 @@
       <tr>
         <td colspan="2" width="580px" ><p class="font_description">
 			<% unless user.memberships.empty? %>
-			<%= l(:label_contribute_to, :project_count => "#{user.memberships.count}") %>
+			<%= l(:label_contribute_to, :count => user.memberships.count) %>
 			<% for member in user.memberships %>
 			<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
 			<% end %>
@@ -25,7 +25,7 @@
 			</p></td>
         </tr>
       <tr>        
-        <td width="200" align="right" class="font_lighter"><%= l(:label_user_joinin) %><%= format_date(user.created_on) %>
+        <td width="200" align="right" class="font_lighter"><%= l(:label_user_joinin) %>&nbsp;<%= format_date(user.created_on) %>
         </td>
       </tr>
     </table></td>
diff --git a/app/views/tags/_project_tag.html.erb b/app/views/tags/_project_tag.html.erb
index 8694d69ca..d10506d0d 100644
--- a/app/views/tags/_project_tag.html.erb
+++ b/app/views/tags/_project_tag.html.erb
@@ -1,32 +1,30 @@
-<div id="tags_show">
+<div id="tags_show" style="float: left;">
 	<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
 </div>
+<div style="float: left;">
 <% if User.current.logged? %>
 	<span> <%= toggle_link (l(:label_add_tag)), 'put-tag-form', {:focus => 'tags_name'} %> </span>
 <% end %>
+
 <div id="put-tag-form" style="display: none;text-align: center">
 	<%= form_for "tag_for_save",:remote=>true,:url=>tag_path,
-								:update => "tags_show",
-								:complete => '$("#put-tag-form").slideUp();' do |f| %>
-		<table>	
+								   :update => "tags_show",
+								   :complete => '$("#put-tag-form").slideUp();' do |f| %>
+		<table>
 			<tr>
 				<td>
 					<%= f.text_field :name ,:id => "tags_name",:size=>"20",
-    				 :require=>true,
-    				 :maxlength => Setting.tags_max_length,
-       				 :minlength=>Setting.tags_min_length %>
+    				                 :require=>true,
+    				                 :maxlength => Setting.tags_max_length,
+       				              :minlength=>Setting.tags_min_length %>
 				</td>
-				
 					<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
-				
-				
 					<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
-				
-				<td style="margin-left: 5px">
+				<td style="margin-left: 5px" vertical-valign="middle" >
 					<a href="#"  onclick='$("#tags_name").parent().submit();' type="button" class="submit f_l"></a>
 				</td>
 			<tr>
 		</table>
 	<% end %>
 </div>
-
+</div>
diff --git a/app/views/tags/_show_attachments.html.erb b/app/views/tags/_show_attachments.html.erb
index a76211fc6..ca6a2dd7a 100644
--- a/app/views/tags/_show_attachments.html.erb
+++ b/app/views/tags/_show_attachments.html.erb
@@ -24,19 +24,19 @@
               &nbsp;&nbsp;
               <%= file.description %>
 		      <div class="c9 gray-color">
-                <%= l('label_attachment_category')%>
+                <%= l('attachment.category')%>
                 <%=result_come_from file%>
               </div>
 		      <span class="gray blue-color">
-		        <%= l('label_attachment_download_num')%>
+		        <%= l('attachment.download_num')%>
                 <%= file.downloads%>|
-		        <%= l('label_attachment_size')%>
+		        <%= l('attachment.size')%>
                 <%= number_to_human_size(file.filesize) %>|
-		        <%= l('label_attachment_sharer')%>
+		        <%= l('attachment.sharer')%>
                 <a class="gray" >
                     <%= link_to file.author, user_path(file.author), target: "_blank" unless file.author.blank? %>
                 </a>|
-		        <%= l('label_attachment_upload_time')%>
+		        <%= l('attachment.upload_time')%>
                 <%= format_time(file.created_on) %>
 		      </span> 
 		      <div style="display: none"></div>
diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
index 225a09aec..b97012723 100644
--- a/app/views/tags/_tag_name.html.erb
+++ b/app/views/tags/_tag_name.html.erb
@@ -31,7 +31,12 @@
     <!-- 用来显示三大对象的主页中的tag  故是全部显示  -->
     <% if @tags.size > 0 %>
         <% @tags.each do |tag| %>
-            <div id="tag">
+            <!--项目暂时单独出来，后面重构-->
+            <% if object_flag == '2' %>
+                <span class="re_tag f_l">
+                <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %></span>
+            <% else %>
+                <div id="tag">
                 <span class="tag_show">
                   <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %>
                   <!-- 对用户主页 是本人 ，对项目，需求，问题是管理员 -->
@@ -43,13 +48,6 @@
                                                         :taggable_id => obj.id, :taggable_type => object_flag %>
                          </span>
                       <% end %>
-                    <% when '2' %>
-                     <% if (ProjectInfo.find_by_project_id(obj.id)).try(:user_id) == User.current.id %>
-                       <span class='del'>
-                         <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
-                                                      :taggable_id => obj.id, :taggable_type => object_flag %>
-                       </span>
-                     <% end %>
                      <% when '3' %>
                        <% if (ProjectInfo.find_by_project_id(obj.project_id)).try(:user_id) == User.current.id %>
                         <span class='del'>
@@ -101,6 +99,7 @@
                     <% end %>
                 </span>
             </div>
-        <% end %>        
+            <% end %>
+        <% end %>
     <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/_my_joinedcourse.html.erb b/app/views/users/_my_joinedcourse.html.erb
index e616004e6..373ed9234 100644
--- a/app/views/users/_my_joinedcourse.html.erb
+++ b/app/views/users/_my_joinedcourse.html.erb
@@ -16,8 +16,8 @@
   <div class="menu">
 	<%= link_to "#{l(:label_course_new)}", new_course_path, class: 'icon icon-add' if @user == User.current %>
     <ul>
-      <li mode='doing' class="on"><%= l(:label_course_doing)%></li>
-      <li mode='end'><%= l(:label_course_done)%></li>
+      <li mode='doing' class="on"><%= l('user.courses.doing')%></li>
+      <li mode='end'><%= l('user.courses.done')%></li>
     </ul>
   </div>
 
diff --git a/app/views/welcome/_hot_projects_list.html.erb b/app/views/welcome/_hot_projects_list.html.erb
index d14a6901b..ff41fa532 100644
--- a/app/views/welcome/_hot_projects_list.html.erb
+++ b/app/views/welcome/_hot_projects_list.html.erb
@@ -10,7 +10,7 @@
             </span>
 		<% end %>
 		<%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%>
-		(<%= link_to l(:label_project_member_amount, :count=>projectCount(project)), project_member_path(project) ,:course =>'0' %>)
+		(<%= link_to l(:label_project_member_amount, :count => projectCount(project)), project_member_path(project) ,:course =>'0' %>)
 	</div>
 	<div  style=" float: left;margin:5px; margin-left: 10px; width: 380px;min-height: 42px;">
 		<span class='font_lighter' title ='<%= project.short_description%>'> <%=project.description.truncate(90, omission: '...')%> </span>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 51139ac89..ba0002eff 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -115,7 +115,7 @@
 		<div class="forum-topic" style="height: 25px; width: 98%; margin-left: 2px;">
 			<h3 style="color: rgb(21, 188, 207);"><strong> <%= l(:lable_bar_active)%> </strong> <%= link_to l(:label_my_question) , newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
 			<%= link_to l(:label_my_feedback) , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%> </h3>
-			<span style="margin-top: -30px;float: right; display: block;"> <%= link_to l(:label_more), forums_path %> </span>
+			<span style="margin-top: -30px;float: right; display: block;"> <%= link_to l(:button_more), forums_path %> </span>
 		</div>
 		<div class="welcome-box-list-new memo_activity">
 			<% topics = find_new_forum_topics(12) %>
diff --git a/config/initializers/rails_kindeditor.rb b/config/initializers/rails_kindeditor.rb
new file mode 100644
index 000000000..e928a6c7d
--- /dev/null
+++ b/config/initializers/rails_kindeditor.rb
@@ -0,0 +1,19 @@
+RailsKindeditor.setup do |config|
+
+  # Specify the subfolders in public directory.
+  # You can customize it , eg: config.upload_dir = 'this/is/my/folder'
+  config.upload_dir = 'files/uploads'
+
+  # Allowed file types for upload.
+  config.upload_image_ext = %w[gif jpg jpeg png bmp]
+  config.upload_flash_ext = %w[swf flv]
+  config.upload_media_ext = %w[swf flv mp3 wav wma wmv mid avi mpg asf rm rmvb]
+  config.upload_file_ext = %w[doc docx xls xlsx ppt htm html txt zip rar gz bz2]
+  
+  # Porcess upload image size
+  # eg: 1600x1600 => 800x800
+  #     1600x800  => 800x400
+  #     400x400   => 400x400  # No Change
+  # config.image_resize_to_limit = [800, 800]
+
+end
diff --git a/config/locales/commons/en.yml b/config/locales/commons/en.yml
index 5998ee875..296e8bc30 100644
--- a/config/locales/commons/en.yml
+++ b/config/locales/commons/en.yml
@@ -138,10 +138,7 @@ en:
         circular_dependency: "This relation would create a circular dependency"
         cant_link_an_issue_with_a_descendant: "An issue cannot be linked to one of its subtasks"
 
-  attachment_all: "All"
-  attachment_browse: "Attachment Content Browse"
-  attachment_sufix_browse: "Attachment Type Browse"
-  attachment_type: "Attachment Type"
+
   general_text_No: 'No'
   general_text_Yes: 'Yes'
   general_text_no: 'no'
@@ -166,7 +163,6 @@ en:
   label_requirement: Calls
   label_forum: Forum
   label_contest: Contest
-
   
   
   
@@ -189,7 +185,7 @@ en:
  
   text_are_you_sure: Are you sure?   #js 提示 
 
-
+  label_no_data: No data to display
   # 项目、课程、用户公用
   label_settings: Settings
   label_information_plural: Information  
@@ -206,11 +202,12 @@ en:
   button_cancel: Cancel
   label_submit: Submit  
   button_project_tags_add: Add
-  label_more: "More>>"
   button_download: Download
+  button_more: "More»"
   button_delete: Delete   
-
-
+  button_unfollow: Unfollow
+  button_follow: Follow
+  button_browse: Browse
 
 
   #
diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml
index a0eb6e74a..efb08ec6e 100644
--- a/config/locales/commons/zh.yml
+++ b/config/locales/commons/zh.yml
@@ -147,10 +147,7 @@ zh:
         cant_link_an_issue_with_a_descendant: "问题不能关联到它的子任务"
         groupname_repeat: "该班名已存在"
 
-  attachment_all: "全部"
-  attachment_sufix_browse: "文件类型"
-  attachment_browse: "内容类型"
-  attachment_type: '分类'
+
   general_text_No: '否'
   general_text_Yes: '是'
   general_text_no: '否'
@@ -190,7 +187,10 @@ zh:
 
 
   text_are_you_sure: 您确定要删除吗？        #js 提示
-  
+
+
+
+  label_no_data: 没有任何数据可供显示  
   # 项目、课程、用户公用
   label_settings: 配置
   label_information_plural: 信息  
@@ -207,10 +207,14 @@ zh:
   button_cancel: 取消
   label_submit: 提交
   button_project_tags_add: 增加  
-  label_more: "更多>>"
   button_download: 下载
-  button_more: 更多 
+  button_more: "更多»"
   button_delete: 删除
+  button_unfollow: 取消关注
+  button_follow: 关注
+  button_watch: 跟踪
+  button_unwatch: 取消跟踪
+  button_browse: 浏览
 
 
   #
diff --git a/config/locales/contests/en.yml b/config/locales/contests/en.yml
index e124e3f1a..1c2784050 100644
--- a/config/locales/contests/en.yml
+++ b/config/locales/contests/en.yml
@@ -2,3 +2,13 @@ en:
   # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
   direction: ltr
 
+  #
+  #  竞赛托管平台
+  #
+  #  主页
+  #
+  label_current_hot_contest: Latest Hot Competition
+  label_current_attendingcontest_work: Latest Competition Work
+  label_issue_feedback_activities: Question&Feedback
+  label_more_information: More...
+  label_release_time: Release-time
\ No newline at end of file
diff --git a/config/locales/contests/zh.yml b/config/locales/contests/zh.yml
index 08115110b..1c4c4d126 100644
--- a/config/locales/contests/zh.yml
+++ b/config/locales/contests/zh.yml
@@ -3,4 +3,15 @@
 # by tsechingho (http://github.com/tsechingho)
 zh:
   # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
-  direction: ltr
\ No newline at end of file
+  direction: ltr
+  
+  #
+  #  竞赛托管平台
+  #
+  #  主页
+  #
+  label_current_hot_contest: 最新热门竞赛
+  label_current_attendingcontest_work: 最新参赛作品
+  label_issue_feedback_activities: 问题和反馈动态
+  label_more_information: 更多>>
+  label_release_time: 发布时间
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cf37867b5..910eb0f98 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -71,10 +71,9 @@ en:
 
   field_summary: Summary
   field_job_category: Job category   # added by bai
-  field_filename: File
-  field_file_dense: File Dense
-  field_filesize: Size
-  field_downloads: Downloads
+
+
+
   field_author: Author
   field_created_on: Created
   field_closed_on: Closed
@@ -108,7 +107,6 @@ en:
   field_last_login_on: Last connection
 
   field_effective_date: Date
-  field_version: Version
   field_type: Type
   field_host: Host
   field_port: Port
@@ -329,10 +327,7 @@ en:
   permission_notificationcomment_contestnotifications: Add the notice of contest comments
   permission_upload_attachments: Uploading resource
 
-  project_module_issue_tracking: Issue tracking
-  project_module_time_tracking: Time tracking
-  project_module_files: Files
-  project_module_boards: Forums  
+
   # edit by meng
   lable_hot_course: Hot Courses
   label_course_join_student: Join a course
@@ -343,8 +338,7 @@ en:
   label_create_new_projects: Create a project
   label_work_scores_people: The total number of users given scores
   label_project_grade: Score
-  label_user_for_project_grade: Score
-  label_relation_files: Select an existing resource
+
   # Personal signature tips
 
 
@@ -481,13 +475,11 @@ en:
   label_text: Long text
   label_attribute: Attribute
   label_attribute_plural: Attributes
-  label_no_data: No data to display
   label_change_status: Change status
   label_history: History
   label_attachment: Files
-  label_attachment_new: New file
   label_attachment_delete: Delete file
-  label_attachment_plural: Files
+  
   label_file_added: File added
   label_report: Report
   label_report_plural: Reports
@@ -617,12 +609,10 @@ en:
   label_latest_revision_plural: Latest revisions
   label_view_revisions: View revisions
   label_view_all_revisions: View all revisions
-  label_max_size: Maximum size
   label_sort_highest: Move to top
   label_sort_higher: Move up
   label_sort_lower: Move down
   label_sort_lowest: Move to bottom
-  label_roadmap: Roadmap
   label_roadmap_due_in: "Due in %{value}"
   label_roadmap_overdue: "%{value} late"
   label_roadmap_no_issues: No issues for this version
@@ -727,7 +717,6 @@ en:
   label_plugins: Plugins
   label_ldap_authentication: LDAP authentication
   label_downloads_abbr: D/L
-  label_optional_description: Optional description
   label_add_another_file: Add another file
   label_preferences: Preferences
   label_chronological_order: In chronological order
@@ -797,7 +786,7 @@ en:
   label_cross_project_hierarchy: With project hierarchy
   label_cross_project_system: With all projects
   label_gantt_progress_line: Progress line
-  label_files_filter: Files Filter：
+ 
 
   button_check_all: Check all
   button_uncheck_all: Uncheck all
@@ -896,7 +885,7 @@ en:
   text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s)?'
   text_issues_destroy_descendants_confirmation: "This will also delete %{count} subtask(s)."
   text_time_entries_destroy_confirmation: 'Are you sure you want to delete the selected time entr(y/ies)?'
-  text_select_project_modules: 'Select modules to enable for this project:'
+
   text_default_administrator_account_changed: Default administrator account changed
   text_file_repository_writable: Attachments directory writable
   text_plugin_assets_writable: Plugin assets directory writable
@@ -936,9 +925,7 @@ en:
   text_turning_multiple_off: "If you disable multiple values, multiple values will be removed in order to preserve only one value per item."
   text_applied_project: "User %{id} Apply Join Project %{project}"
 
-  default_role_manager: Manager
-  default_role_developer: Developer
-  default_role_reporter: Reporter
+
   default_tracker_bug: Bug
   default_tracker_feature: Feature
   default_tracker_support: Support
@@ -1022,8 +1009,7 @@ en:
   #end by huang
 
   #added by liuping
-  button_unfollow: Unfollow
-  button_follow: Follow
+
   label_delete_confirm: Confirm delete？
 
   label_exit_project: Exit Project
@@ -1037,7 +1023,7 @@ en:
   label_leave_message: Message content
   label_message: message board
   field_add: Add before %{time}
-  button_more: More
+
 
   label_bidding_project: projects
   button_bidding: I will participate in it
@@ -1070,11 +1056,6 @@ en:
     zero: Follower
     one: Follower
     other: Followers
-  #end
-  label_member_since: joined
-  label_contribute_to: Participates %{project_count} projects：
-  #modify by men
-
   #end
   label_total_commit: Totally %{total_commit} commits  # modified by bai
   #modify by men
@@ -1087,7 +1068,7 @@ en:
   label_type_as: Type as
   label_status_as: Status as
   label_priority_as: Priority as
-  label_member_list: Member list
+
   label_author_name: Posted by %{author_name}
   label_comments_count: (%{count} comments)
   label_post_on: posts on
@@ -1443,13 +1424,7 @@ en:
   label_your_course: your course
   label_have_message: have a new message
   lable_not_receive_mail: Click here don't receive email form site！
-#added by linchun as competition#
 
-  label_current_hot_contest: Latest Hot Competition
-  label_current_attendingcontest_work: Latest Competition Work
-  label_issue_feedback_activities: Question&Feedback
-  label_more_information: More...
-  label_release_time: Release-time
 
   label_weixin: WeiXin
   
@@ -1584,7 +1559,6 @@ en:
   label_trustie_team: The Trustie development team
   label_memos_max_length: The content of the post up to 65535 characters in length
   label_forums_max_length: Post Bar describing the maximum length of 65535 characters
-  label_unknow_type: Unknow type
 
   review_assignments: Review assignments
   label_my_school: My school
@@ -1609,3 +1583,5 @@ en:
   label_recently_updated_message: Recently updated the message
   label_recently_updated_courseware: Recently updated the courseware
   label_no_courses: You do not participate in any course, please search the curriculum, course, or create a course!
+  label_commit_failed: commit failed
+  #api end
diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml
index 56177bea3..5aca81426 100644
--- a/config/locales/projects/en.yml
+++ b/config/locales/projects/en.yml
@@ -19,7 +19,9 @@ en:
   # 
   lable_hot_projects: Hot Projects
   label_private: private
-  label_project_member_amount: "%{count} members"
+  label_project_member_amount: 
+    one: "%{count} member"
+    other: "%{count} members"
   label_project_score_tips: "Considering all activities of the project, project's score reflects the activity level of project"
   label_project_score: Score
 
@@ -29,7 +31,7 @@ en:
   #
   #  左边栏
   #           
-  label_id: "ID:"
+  label_project_id: "Projcet ID:"
     
   label_apply_project: Apply to Join
   label_exit_project: Exit
@@ -48,24 +50,116 @@ en:
  
   project_module_boards: Forums
   project_module_boards_post: New Post
-  # 与课程公用资源库
+  project_module_files: Resources
+  label_upload_files: New File
   project_module_repository: Repository
   project_module_create_repository: New Repository
 
-
+  label_project_more: More
   project_module_news: News
   project_module_wiki: Wiki
   project_module_code_review: Code Review
   project_module_calendar: Calendar
   project_module_gantt: Gantt
   project_module_documents: Documents
-  label_project_tool_response: Response
-  label_module_share: DTS Test Tool
+  label_roadmap: Roadmap
+  label_project_tool_response: Feedback
+  project_module_dts: DTS Test Tool
 
   label_project_overview: "Profile:"
   label_expend_information: More Information
 
 
+  #   
+  #  项目托管平台
+  #
+  #  项目成员
+  #  
+  label_member_list: Members
+
+  label_member_since: "joined at"
+  label_user_for_project_grade: Score
+
+  default_role_manager: Manager
+  default_role_developer: Developer
+  default_role_reporter: Reporter
+
+
+  #   
+  #  项目托管平台
+  #
+  #  关注者列表
+  #  
+  label_followers: Followers
+  label_contribute_to: 
+    one: "Participates %{count} project—"
+    other: "Participates %{count} projects—"
+
+
+  #   
+  #  项目托管平台
+  #
+  #  资源库
+  #  
+  lable_file_sharingarea: Resources
+
+  # 资源库（附件）公用
+  label_relation_files: Select an existing resource
+  label_search_by_keyword: "Search by keywords"
+  label_files_filter: "Files Filter:"
+
+  attachment_all: "All"
+  attachment_browse: "Attachment Content Browse"
+  attachment_sufix_browse: "Attachment Type Browse"
+  label_unknow_type: Unknow type 
+ 
+  field_filename: File
+  field_filesize: Size
+  field_filecontenttype: Content
+  field_filetype: File Typ 
+  field_downloads: Downloads
+  field_file_dense: Dense
+ 
+   # 资源库（附件）公用 > 上传文件
+  label_attachment_new: New file
+  field_version: Version
+  attachment_type: "Attachment Type"
+ 
+  label_attachment_plural: Files
+  label_no_file_uploaded: No file uploaded
+  label_max_size: Maximum size
+
+  label_optional_description: Description
+  label_file_count: "%{count} files were uploaded successfully"
+
+  #   
+  #  项目托管平台
+  #
+  #  问题跟踪
+  #  
+
+
+  #   
+  #  项目托管平台
+  #
+  #  项目讨论区
+  #  
+  
+
+  #   
+  #  项目托管平台
+  #
+  #  资源库
+  #  
+  
+
+  #   
+  #  项目托管平台
+  #
+  #  版本库
+  #  
+
+
   #   
   #  项目托管平台
   #
@@ -77,6 +171,12 @@ en:
   label_repository_plural: Repositories
   enumeration_activities: Activities
 
+  text_select_project_modules: "Select modules to enable for this project:"
+  project_module_issue_tracking: Issue tracking
+  project_module_time_tracking: Time tracking
+  project_module_course: 课程
+  project_module_boards: Forums  
+  
   #   
   #  项目托管平台
   #
@@ -100,7 +200,7 @@ en:
   #   
   #  项目托管平台
   #
-  #  新建项目
+  #  新建项目/项目配置 >信息
   #      
   label_project_new_description: "A project can be used to do anything that requires distributed collaboration."
   field_name: Name
@@ -155,6 +255,10 @@ en:
 
 
 
-
+  #
+  #  项目托管平台
+  #
+  #  项目得分
+  #  
   label_approve: Approve
   label_refusal: Refusal
\ No newline at end of file
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index c70392171..bd547c37e 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -22,7 +22,9 @@ zh:
   # 
   lable_hot_projects: 热门项目
   label_private: 私有
-  label_project_member_amount: "%{count}人"
+  label_project_member_amount: 
+    one: "%{count}人"
+    other: "%{count}人"
   label_project_score_tips: 项目得分，综合考虑了项目的各项活动，反映了该项目的活跃程度
   label_project_score: 项目评分
 
@@ -32,13 +34,14 @@ zh:
   #
   #  左边栏
   #           
-  label_id: "ID:"
+  label_project_id: "项目ID:"
     
   label_apply_project: 申请加入
   label_exit_project: 退出项目
   label_apply_project_waiting: 已处理申请，请等待管理员审核
   label_unapply_project: 取消申请
-  
+  lable_sure_exit_project: 是否确认退出该项目  
+
   label_member: 成员
   project_module_attachments: 资源  
 
@@ -49,22 +52,119 @@ zh:
 
   project_module_boards: 讨论区
   project_module_boards_post: 发帖
-  # 与课程公用资源库
+  project_module_files: 资源库 
   project_module_repository: 版本库
   project_module_create_repository: 创建版本库
 
+  label_project_more: 更多
   project_module_news: 新闻
   project_module_wiki: Wiki
   project_module_code_review: 代码审查
   project_module_calendar: 日历
   project_module_gantt: 甘特图  
   project_module_documents: 文档  
+  label_roadmap: 里程碑 #版本路线图
+  project_module_dts: DTS测试工具
   label_project_tool_response: 用户反馈  
-  label_module_share: DTS测试工具
 
   label_project_overview: "项目简介："
   label_expend_information: 展开更多信息
 
+ 
+  #   
+  #  项目托管平台
+  #
+  #  项目成员
+  #  
+  label_member_list: 成员列表
+
+  label_member_since: "加入"
+  label_user_for_project_grade: 个人得分
+
+  default_role_manager: 管理人员
+  default_role_developer: 开发人员
+  default_role_reporter: 报告人员
+ 
+ 
+  #   
+  #  项目托管平台
+  #
+  #  关注者列表
+  #  
+  label_followers: 关注
+  label_contribute_to: 
+    one: "参与了 %{count}个项目："
+    other: "参与了 %{count}个项目："
+
+
+  #   
+  #  项目托管平台
+  #
+  #  资源库
+  #  
+  lable_file_sharingarea: 资源共享区
+
+  label_upload_files: 上传文件
+
+
+  # 资源库（附件）公用 > 关联资源
+  label_relation_files: 关联已有资源
+  label_search_by_keyword: "按关键字搜索："
+  label_files_filter: "资源过滤："
+   
+  field_filename: 文件
+  field_filesize: 大小
+  field_filecontenttype: 内容分类
+  field_filetype: 文件格式
+  field_file_dense: 是否公开
+  field_downloads: 下载次数
+
+  attachment_sufix_browse: "文件类型"
+  attachment_browse: "内容类型"
+  attachment_all: "全部"
+  label_unknow_type: 未知类型
+  
+  # 资源库（附件）公用 > 上传文件
+  label_attachment_new: 新建文件
+  field_version: 版本
+  attachment_type: "分类"
+ 
+  label_attachment_plural: 文件
+  label_no_file_uploaded: 未上传文件
+  label_max_size: 最大文件大小
+
+  label_optional_description: 可选的描述
+
+
+  #   
+  #  项目托管平台
+  #
+  #  问题跟踪
+  #  
+
+
+
+
+
+  #   
+  #  项目托管平台
+  #
+  #  项目讨论区
+  #  
+  
+
+  #   
+  #  项目托管平台
+  #
+  #  资源库
+  #  
+  
+
+  #   
+  #  项目托管平台
+  #
+  #  版本库
+  # 
 
   #   
   #  项目托管平台
@@ -79,8 +179,12 @@ zh:
 
 
   text_select_project_modules: '请选择此项目可以使用的模块：'
-
-  
+  project_module_issue_tracking: 问题跟踪
+  project_moule_boards_show: 项目论坛
+  project_module_time_tracking: 时间跟踪
+  project_module_course: 课程
+ 
+ 
   #   
   #  项目托管平台
   #
@@ -91,6 +195,7 @@ zh:
   label_invite_email_tips: 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！
   notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册!
   label_email_format_error: 您所填写的电子邮件格式不正确
+  label_user_role_null: 用户和角色不能留空！
   label_send_email: 免费发送
   label_input_email: 请输入邮箱地址
   
diff --git a/config/locales/users/en.yml b/config/locales/users/en.yml
index fbfe1444e..ed10c69ee 100644
--- a/config/locales/users/en.yml
+++ b/config/locales/users/en.yml
@@ -77,8 +77,6 @@ en:
   label_technical_title: Title
   
   label_bidding_user_studentcode: Student ID
-  label_account_developer: Developer
-  label_account_student: Student
 
 
   #
@@ -112,7 +110,7 @@ en:
   label_layouts_feedback: "a message " 
   label_of_feedback: from
 
-  label_goto: Go to>>  
+  label_goto: "Go to»" 
 
   label_activity_project: "Project："
   label_active_call: call
@@ -180,12 +178,12 @@ en:
   #
   label_responses: Messages  
   label_user_response: Feedback  
-  label_leave_a_message: Leave him/her a message    
+  label_leave_a_message: "Leave him/her a message"   
   button_leave_meassge: Submit
   button_clear_meassge: Reset
 
   label_user_login_new: Login
-  label_user_login_tips: You haven't logged in, please login first to leave a message!
+  label_user_login_tips: "You haven't logged in, please login first to leave a message!"
 
   label_bid_respond_delete: Delete
   label_bid_respond_quote: Respond
diff --git a/config/locales/users/zh.yml b/config/locales/users/zh.yml
index 1362380a0..c6f7e4142 100644
--- a/config/locales/users/zh.yml
+++ b/config/locales/users/zh.yml
@@ -36,6 +36,7 @@ zh:
   label_user_edit: "修改资料"
    
   label_user_score: 个人综合得分    
+  # 用户身份在/my的修改资料下
   label_user_score_of_collaboration: 协同得分   
   label_user_score_of_influence: 影响力得分    
   label_user_score_of_skill: 技术得分 
@@ -87,10 +88,9 @@ zh:
   label_technicl_title_associate_professor: 副教授
   label_technicl_title_lecturer: 讲师
   label_technicl_title_teaching_assistant: 助教
-  
+
+  # 用户身份（学生、开发者）标签在/my的修改资料下
   label_bidding_user_studentcode: 学号
-  label_account_developer: 开发者
-  label_account_student: 学生
 
   label_no_current_fans: 该用户暂无粉丝
   label_no_current_watchers: 该用户暂未关注其他用户
@@ -115,7 +115,7 @@ zh:
   label_of_feedback: 的
   label_layouts_feedback: 留言   
    
-  label_goto: 前往>>  
+  label_goto: "前往»"  
   
   label_activity_project: "项目："
   label_active_call: 需求
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 45d6a9d20..f3879421a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -99,10 +99,9 @@ zh:
   lastname_empty: 姓氏不能为空
   enterprise_empty: 企业名不能为空
   field_lastname_eg: '(例：张三丰，请填写[张])'
-  field_filename: 文件
-  field_file_dense: 是否公开
-  field_filesize: 大小
-  field_downloads: 下载次数
+
+
+
   field_author: 作者
   field_created_on: 创建于
   field_updated_on: 更新于
@@ -130,13 +129,12 @@ zh:
   field_priority: 优先级
   field_fixed_version: 目标版本
   field_user: 用户
-  field_principal: 用户/用户组
+  field_principal: 用户
   field_role: 角色
   field_homepage: 主页
   field_time: 课时
   field_class_period: 学时
   field_code: 学分
-  field_is_public: 公开
   field_open_student: 学生列表公开
   field_parent: 上级项目
   field_is_in_roadmap: 在路线图中显示
@@ -145,7 +143,6 @@ zh:
   field_last_login_on: 最后登录
   field_language: 语言
   field_effective_date: 日期
-  field_version: 版本
   field_type: 类型
   field_host: 主机
   field_port: 端口
@@ -350,17 +347,9 @@ zh:
   permission_contest_attachments_download: 竞赛附件下载
   permission_upload_attachments: 资源上传
 
-  project_module_issue_tracking: 问题跟踪
-  project_moule_boards_show: 项目论坛
-  project_module_time_tracking: 时间跟踪
 
 
 
-
-
-  project_module_course: 课程
-
-
   label_user: 用户
   label_user_plural: 用户列表
 
@@ -474,8 +463,6 @@ zh:
   label_new_contest: 竞赛
   label_requirement_focus: 关注需求
   label_developer: 用户
-  label_account_developer: 开发者
-  label_account_student: 学生
   label_enterprise_into: 进入企业
   label_college_into: 进入高校
   label_investor: 投资人：
@@ -517,7 +504,7 @@ zh:
   label_summer: 夏季学期
   label_autumn: 秋季学期
   label_winter: 冬季学期
-  label_followers: 关注
+
 
   label_teacher_list: 教师列表
   label_student_list: 学生列表
@@ -566,15 +553,15 @@ zh:
   label_text: 文本
   label_attribute: 属性
   label_attribute_plural: 属性
-  label_no_data: 没有任何数据可供显示
+
   label_change_status: 变更状态
   label_history: 历史记录
   label_attachment: 文件
-  label_attachment_new: 新建文件
+
   label_file_upload: 上传资料
   label_course_file_upload: 上传了课件
   label_attachment_delete: 删除文件
-  label_attachment_plural: 文件
+
   label_file_added: 文件已添加
   label_report: 报表
   label_report_plural: 报表
@@ -700,13 +687,11 @@ zh:
   label_latest_revision_plural: 最近的修订版本
   label_view_revisions: 查看修订
   label_view_all_revisions: 查看所有修订
-  label_no_file_uploaded: 未上传文件
-  label_max_size: 最大文件大小
+
   label_sort_highest: 置顶
   label_sort_higher: 上移
   label_sort_lower: 下移
   label_sort_lowest: 置底
-  label_roadmap: 里程碑 #版本路线图
   label_roadmap_due_in: "截止日期到  %{value}"
   label_roadmap_overdue: "%{value} 延期"
   label_roadmap_no_issues: 该版本没有问题
@@ -855,7 +840,7 @@ zh:
   label_plugins: 插件
   label_ldap_authentication: LDAP 认证
   label_downloads_abbr: D/L
-  label_optional_description: 可选的描述
+
   label_add_another_file: 添加其它文件
   label_preferences: 首选项
   label_chronological_order: 按时间顺序
@@ -923,8 +908,6 @@ zh:
   button_sort: 排序
   button_log_time: 登记工时
   button_rollback: 恢复到这个版本
-  button_watch: 跟踪
-  button_unwatch: 取消跟踪
   button_reply: 回复
   button_archive: 存档
   button_unarchive: 取消存档
@@ -1011,9 +994,6 @@ zh:
   text_applied_project: "用户 %{id} 申请加入项目 %{project}"
   text_issue_expire: "分配给您的任务%{issue}即将到期"
 
-  default_role_manager: 管理人员
-  default_role_developer: 开发人员
-  default_role_reporter: 报告人员
   default_tracker_bug: 错误
   default_tracker_feature: 功能
   default_tracker_support: 支持
@@ -1107,7 +1087,7 @@ zh:
   description_all_columns: 所有列
   button_export: 导出
   label_export_options: "%{export_format} 导出选项"
-  error_attachment_too_big: 该文件无法上传。超过文件大小限制 (%{max_size})
+
   error_pic_type: "仅支持如下图片格式："
   notice_failed_to_save_time_entries: "无法保存下列所选取的 %{total} 个项目中的 %{count} 工时： %{ids}。"
   label_x_issues:
@@ -1236,11 +1216,6 @@ zh:
     zero: 个关注者
     one: 个关注者
     other: 个关注者
-  #end
-  label_member_since: 加入
-  label_contribute_to: 参与了 %{project_count} 个项目：
-  #modify by men
-
   #end
   label_total_commit: 共%{total_commit}次提交
   label_question_number: 第%{question_number}题：
@@ -1257,7 +1232,7 @@ zh:
   label_type_as: 类型为
   label_status_as: 状态为
   label_priority_as: 优先级为
-  label_member_list: 成员列表
+
   label_author_name: 由%{author_name}发表了
 
   label_post_on: 发表了
@@ -1271,12 +1246,8 @@ zh:
 
 
   #added by liuping
-  button_unfollow: 取消关注
-  button_follow: 关注
-  label_followers: 关注
 
   label_delete_confirm: 确认删除？
-  label_more_tags: 更多
   label_tags_bid: 需求名称
   label_tags_course_name: 课程名称
   label_tags_bid_description: 需求描述
@@ -1613,8 +1584,6 @@ zh:
   label_code_submit_number: 代码提交次数
   label_topic_number: 讨论区发言数量
 
-  label_files_filter: 资源过滤：
-
 
     
   label_join_contest: 加入竞赛
@@ -1741,7 +1710,6 @@ zh:
 
   label_project_grade: 项目得分
   label_user_grade: 个人得分
-  label_user_for_project_grade: 个人得分
   label_system_grade: 系统评分
 
   label_ta: 助教
@@ -1807,7 +1775,6 @@ zh:
   you_are_master: 您是该项目的版主
 
   #add by linchun (竞赛相关)
-  label_upload_files: 上传文件
   label_upload_softwarepackage: 上传软件包
   label_upload_cuttingphoto: 上传截图
   label_contests_reward_method: 奖励方式
@@ -1888,7 +1855,6 @@ zh:
     one: 个动态
     other: 个动态
 
-  label_relation_files: 关联已有资源
   label_contest_settings: 配置竞赛
   label_contest_delete: 删除竞赛
   label_noawards_current: 暂未评奖
@@ -1945,12 +1911,6 @@ zh:
   lable_not_receive_mail: 点此设置接收本站邮件偏好！
   label_contest_notification: 竞赛通知
 
-  #english site translation
-  label_current_hot_contest: 最新热门竞赛
-  label_current_attendingcontest_work: 最新参赛作品
-  label_issue_feedback_activities: 问题和反馈动态
-  label_more_information: 更多>>
-  label_release_time: 发布时间
 
   label_weixin: 微信扫码
 
@@ -1985,7 +1945,6 @@ zh:
 
   lable_hot_course: 活跃课程
   lable_student_list_visable: 学生列表是否公开
-  lable_sure_exit_project: 是否确认退出该项目
 
   lable_input_class_vilidate: 学时只能为整数
   lable_school_list: 学校列表
@@ -1993,7 +1952,6 @@ zh:
   lable_teacher_evaluation: 作业综评
   lable_course_teacher: 主讲老师
   lable_course_end: 课程学期已结束
-  lable_file_sharingarea: 资源共享区
   label_no_contest_news_description: 竞赛描述不能为空
   label_contest_news_condition: 竞赛描述超过5000个汉字
   label_no_contest_news_title: 竞赛标题不能为空
@@ -2061,13 +2019,6 @@ zh:
   label_enterprise_nil: 该模块为最新上线模块，目前还没有创建企业项目！
   label_enterprises: 组织
 
-  label_tags_opensource: 开源项目
-  label_attachment_category: 所属分类
-  label_attachment_download_num: 下载
-  label_attachment_size: 大小
-  label_attachment_sharer: 共享者
-  label_attachment_upload_time: 上传时间
-
 
   #api
   label_recently_updated_notification: 最近更新了通知
@@ -2075,9 +2026,12 @@ zh:
   label_recently_updated_message: 最近更新了留言
   label_recently_updated_courseware: 最近更新了课件
   label_no_courses: 您没有参与任何课程，请搜索课程、加入课程，或者创建课程吧！
+  label_commit_failed: 提交失败
+  #api end
+
   label_end_time: 截止时间
   label_send_email: 确定发送
   label_input_email: 请输入邮箱地址
-  project_module_files: 资源库
+
 
 
diff --git a/config/routes.rb b/config/routes.rb
index 365c5a78e..3ec814839 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -27,6 +27,9 @@
 
 RedmineApp::Application.routes.draw do
 
+  resources :discuss_demos
+  #match '/discuss_demos/new',:to => 'discuss_demo#create',:via =>[:post]
+  #match '/discuss_demo/show',:to => 'discuss_demo#show'
   mount Mobile::API => '/api'
 
   resources :homework_users
@@ -860,6 +863,11 @@ RedmineApp::Application.routes.draw do
   match 'system_log/clear'
   ##ended by lizanle
 
+  resources :git_callback do
+    collection do
+      post 'post_update'
+    end
+  end
 
   Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir|
     file = File.join(plugin_dir, "config/routes.rb")
diff --git a/db/migrate/20150316032155_create_discuss_demos.rb b/db/migrate/20150316032155_create_discuss_demos.rb
new file mode 100644
index 000000000..af7a2a6ed
--- /dev/null
+++ b/db/migrate/20150316032155_create_discuss_demos.rb
@@ -0,0 +1,9 @@
+class CreateDiscussDemos < ActiveRecord::Migration
+  def change
+    create_table :discuss_demos do |t|
+      t.string :title
+      t.text :body
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20150316083717_create_kindeditor_assets.rb b/db/migrate/20150316083717_create_kindeditor_assets.rb
new file mode 100644
index 000000000..19a108b2e
--- /dev/null
+++ b/db/migrate/20150316083717_create_kindeditor_assets.rb
@@ -0,0 +1,17 @@
+class CreateKindeditorAssets < ActiveRecord::Migration
+  def self.up
+    create_table :kindeditor_assets do |t|
+      t.string :asset
+      t.integer :file_size
+      t.string :file_type
+      t.integer :owner_id
+      t.string :asset_type # list by kindeditor: image, file, media, flash
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :kindeditor_assets
+  end
+end
+
diff --git a/db/schema.rb b/db/schema.rb
index 4cce0b5c8..bad1cf2ae 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150311013036) do
+ActiveRecord::Schema.define(:version => 20150305081132) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
diff --git a/doc/Git仓库优化-上线补充.docx b/doc/Git仓库优化-上线补充.docx
new file mode 100644
index 000000000..89627f155
Binary files /dev/null and b/doc/Git仓库优化-上线补充.docx differ
diff --git a/doc/tools/ImageMagick-6.6.0-0-Q16-windows-dll.exe b/doc/tools/ImageMagick-6.6.0-0-Q16-windows-dll.exe
deleted file mode 100644
index 7fde8e34d..000000000
Binary files a/doc/tools/ImageMagick-6.6.0-0-Q16-windows-dll.exe and /dev/null differ
diff --git a/files/2013/09/130913110338_YodaoDict.exe b/files/2013/09/130913110338_YodaoDict.exe
deleted file mode 100644
index cb0fb4658..000000000
Binary files a/files/2013/09/130913110338_YodaoDict.exe and /dev/null differ
diff --git a/files/2013/09/130913112844_YodaoDict.exe b/files/2013/09/130913112844_YodaoDict.exe
deleted file mode 100644
index cb0fb4658..000000000
Binary files a/files/2013/09/130913112844_YodaoDict.exe and /dev/null differ
diff --git a/files/2013/09/130913150242_YodaoDict.exe b/files/2013/09/130913150242_YodaoDict.exe
deleted file mode 100644
index cb0fb4658..000000000
Binary files a/files/2013/09/130913150242_YodaoDict.exe and /dev/null differ
diff --git a/files/2013/09/130913150350_89d0a4acf8770fc08309561559c49b62.exe b/files/2013/09/130913150350_89d0a4acf8770fc08309561559c49b62.exe
deleted file mode 100644
index 6b17f167a..000000000
Binary files a/files/2013/09/130913150350_89d0a4acf8770fc08309561559c49b62.exe and /dev/null differ
diff --git a/files/2013/09/130913211313_navicat.exe b/files/2013/09/130913211313_navicat.exe
deleted file mode 100644
index cde21f595..000000000
Binary files a/files/2013/09/130913211313_navicat.exe and /dev/null differ
diff --git a/files/2013/09/130913214441_89d0a4acf8770fc08309561559c49b62.exe b/files/2013/09/130913214441_89d0a4acf8770fc08309561559c49b62.exe
deleted file mode 100644
index 6b17f167a..000000000
Binary files a/files/2013/09/130913214441_89d0a4acf8770fc08309561559c49b62.exe and /dev/null differ
diff --git a/files/2013/09/130913214715_navicat.exe b/files/2013/09/130913214715_navicat.exe
deleted file mode 100644
index cde21f595..000000000
Binary files a/files/2013/09/130913214715_navicat.exe and /dev/null differ
diff --git a/files/2013/09/130913214952_YodaoDict.exe b/files/2013/09/130913214952_YodaoDict.exe
deleted file mode 100644
index cb0fb4658..000000000
Binary files a/files/2013/09/130913214952_YodaoDict.exe and /dev/null differ
diff --git a/lib/better_errors/.travis.yml b/lib/better_errors/.travis.yml
deleted file mode 100644
index ce51187cf..000000000
--- a/lib/better_errors/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - 2.1.0
-  - 2.0.0
diff --git a/lib/better_errors/.yardopts b/lib/better_errors/.yardopts
deleted file mode 100644
index 73034ccf8..000000000
--- a/lib/better_errors/.yardopts
+++ /dev/null
@@ -1 +0,0 @@
---markup markdown --no-private
diff --git a/lib/better_errors/CHANGELOG.md b/lib/better_errors/CHANGELOG.md
deleted file mode 100644
index 00fc2466b..000000000
--- a/lib/better_errors/CHANGELOG.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Changelog
-
-See https://github.com/charliesome/better_errors/releases
diff --git a/lib/better_errors/Gemfile b/lib/better_errors/Gemfile
deleted file mode 100644
index 287f7749b..000000000
--- a/lib/better_errors/Gemfile
+++ /dev/null
@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-gem "rake"
-gem "rspec", "2.14.1"
-gem "binding_of_caller", platforms: :ruby
-gem "pry", "0.9.12"
-gem "yard"
-gem "kramdown"
diff --git a/lib/better_errors/LICENSE.txt b/lib/better_errors/LICENSE.txt
deleted file mode 100644
index 755ce77a8..000000000
--- a/lib/better_errors/LICENSE.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2014 Charlie Somerville
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/better_errors/README.md b/lib/better_errors/README.md
deleted file mode 100644
index 91488695a..000000000
--- a/lib/better_errors/README.md
+++ /dev/null
@@ -1,103 +0,0 @@
-# Better Errors [![Gem Version](http://img.shields.io/gem/v/better_errors.svg)](https://rubygems.org/gems/better_errors) [![Build Status](https://travis-ci.org/charliesome/better_errors.svg)](https://travis-ci.org/charliesome/better_errors) [![Code Climate](http://img.shields.io/codeclimate/github/charliesome/better_errors.svg)](https://codeclimate.com/github/charliesome/better_errors)
-
-Better Errors replaces the standard Rails error page with a much better and more useful error page. It is also usable outside of Rails in any Rack app as Rack middleware.
-
-![image](http://i.imgur.com/6zBGAAb.png)
-
-## Features
-
-* Full stack trace
-* Source code inspection for all stack frames (with highlighting)
-* Local and instance variable inspection
-* Live REPL on every stack frame
-
-## Installation
-
-Add this to your Gemfile:
-
-```ruby
-group :development do
-  gem "better_errors"
-end
-```
-
-If you would like to use Better Errors' **advanced features** (REPL, local/instance variable inspection, pretty stack frame names), you need to add the [`binding_of_caller`](https://github.com/banister/binding_of_caller) gem by [@banisterfiend](http://twitter.com/banisterfiend) to your Gemfile:
-
-```ruby
-gem "binding_of_caller"
-```
-
-This is an optional dependency however, and Better Errors will work without it.
-
-_Note: If you discover that Better Errors isn't working - particularly after upgrading from version 0.5.0 or less - be sure to set `config.consider_all_requests_local = true` in `config/environments/development.rb`._
-
-## Security
-
-**NOTE:** It is *critical* you put better\_errors in the **development** section. **Do NOT run better_errors in production, or on Internet facing hosts.**
-
-You will notice that the only machine that gets the Better Errors page is localhost, which means you get the default error page if you are developing on a remote host (or a virtually remote host, such as a Vagrant box). Obviously, the REPL is not something you want to expose to the public, but there may also be other pieces of sensitive information available in the backtrace.
-
-To poke selective holes in this security mechanism, you can add a line like this to your startup (for example, on Rails it would be `config/environments/development.rb`)
-
-```ruby
-BetterErrors::Middleware.allow_ip! ENV['TRUSTED_IP'] if ENV['TRUSTED_IP']
-```
-
-Then run Rails like this:
-
-```shell
-TRUSTED_IP=66.68.96.220 rails s
-```
-
-Note that the `allow_ip!` is actually backed by a `Set`, so you can add more than one IP address or subnet.
-
-**Tip:** You can find your apparent IP by hitting the old error page's "Show env dump" and looking at "REMOTE_ADDR".
-
-**VirtualBox:** If you are using VirtualBox and are accessing the guest from your host's browser, you will need to use `allow_ip!` to see the error page.
-
-## Usage
-
-If you're using Rails, there's nothing else you need to do.
-
-If you're not using Rails, you need to insert `BetterErrors::Middleware` into your middleware stack, and optionally set `BetterErrors.application_root` if you'd like Better Errors to abbreviate filenames within your application.
-
-Here's an example using Sinatra:
-
-```ruby
-require "sinatra"
-require "better_errors"
-
-configure :development do
-  use BetterErrors::Middleware
-  BetterErrors.application_root = __dir__
-end
-
-get "/" do
-  raise "oops"
-end
-```
-
-### Unicorn, Puma, and other multi-worker servers
-
-Better Errors works by leaving a lot of context in server process memory. If
-you're using a web server that runs multiple "workers" it's likely that a second
-request (as happens when you click on a stack frame) will hit a different
-worker. That worker won't have the necessary context in memory, and you'll see
-a `Session Expired` message.
-
-If this is the case for you, consider turning the number of workers to one (1)
-in `development`. Another option would be to use Webrick, Mongrel, Thin,
-or another single-process server as your `rails server`, when you are trying
-to troubleshoot an issue in development.
-
-## Get in touch!
-
-If you're using better_errors, I'd love to hear from you. Drop me a line and tell me what you think!
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
diff --git a/lib/better_errors/Rakefile b/lib/better_errors/Rakefile
deleted file mode 100644
index b6329726d..000000000
--- a/lib/better_errors/Rakefile
+++ /dev/null
@@ -1,13 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-namespace :test do
-  RSpec::Core::RakeTask.new(:with_binding_of_caller)
-
-  without_task = RSpec::Core::RakeTask.new(:without_binding_of_caller)
-  without_task.ruby_opts = "-I spec -r without_binding_of_caller"
-
-  task :all => [:with_binding_of_caller, :without_binding_of_caller]
-end
-
-task :default => "test:all"
diff --git a/lib/better_errors/better_errors.gemspec b/lib/better_errors/better_errors.gemspec
deleted file mode 100644
index 315c110c5..000000000
--- a/lib/better_errors/better_errors.gemspec
+++ /dev/null
@@ -1,27 +0,0 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'better_errors/version'
-
-Gem::Specification.new do |s|
-  s.name          = "better_errors"
-  s.version       = BetterErrors::VERSION
-  s.authors       = ["Charlie Somerville"]
-  s.email         = ["charlie@charliesomerville.com"]
-  s.description   = %q{Provides a better error page for Rails and other Rack apps. Includes source code inspection, a live REPL and local/instance variable inspection for all stack frames.}
-  s.summary       = %q{Better error page for Rails and other Rack apps}
-  s.homepage      = "https://github.com/charliesome/better_errors"
-  s.license       = "MIT"
-
-  s.files         = `git ls-files`.split($/)
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
-
-  s.required_ruby_version = ">= 2.0.0"
-
-  s.add_dependency "erubis", ">= 2.6.6"
-  s.add_dependency "coderay", ">= 1.0.0"
-
-  # optional dependencies:
-  # s.add_dependency "binding_of_caller"
-  # s.add_dependency "pry"
-end
diff --git a/lib/better_errors/lib/better_errors.rb b/lib/better_errors/lib/better_errors.rb
deleted file mode 100644
index 394060ecf..000000000
--- a/lib/better_errors/lib/better_errors.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-require "pp"
-require "erubis"
-require "coderay"
-require "uri"
-
-require "better_errors/code_formatter"
-require "better_errors/error_page"
-require "better_errors/middleware"
-require "better_errors/raised_exception"
-require "better_errors/repl"
-require "better_errors/stack_frame"
-require "better_errors/version"
-
-module BetterErrors
-  POSSIBLE_EDITOR_PRESETS = [
-    { symbols: [:emacs, :emacsclient],  sniff: /emacs/i, url: "emacs://open?url=file://%{file}&line=%{line}" },
-    { symbols: [:macvim, :mvim],        sniff: /vim/i,   url: proc { |file, line| "mvim://open?url=file://#{file}&line=#{line}" } },
-    { symbols: [:sublime, :subl, :st],  sniff: /subl/i,  url: "subl://open?url=file://%{file}&line=%{line}" },
-    { symbols: [:textmate, :txmt, :tm], sniff: /mate/i,  url: "txmt://open?url=file://%{file}&line=%{line}" },
-  ]
-
-  class << self
-    # The path to the root of the application. Better Errors uses this property
-    # to determine if a file in a backtrace should be considered an application
-    # frame. If you are using Better Errors with Rails, you do not need to set
-    # this attribute manually.
-    #
-    # @return [String]
-    attr_accessor :application_root
-
-    # The logger to use when logging exception details and backtraces. If you
-    # are using Better Errors with Rails, you do not need to set this attribute
-    # manually. If this attribute is `nil`, nothing will be logged.
-    #
-    # @return [Logger, nil]
-    attr_accessor :logger
-
-    # @private
-    attr_accessor :binding_of_caller_available
-
-    # @private
-    alias_method :binding_of_caller_available?, :binding_of_caller_available
-
-    # The ignored instance variables.
-    # @return [Array]
-    attr_accessor :ignored_instance_variables
-  end
-  @ignored_instance_variables = []
-
-  # Returns a proc, which when called with a filename and line number argument,
-  # returns a URL to open the filename and line in the selected editor.
-  #
-  # Generates TextMate URLs by default.
-  #
-  #   BetterErrors.editor["/some/file", 123]
-  #     # => txmt://open?url=file:///some/file&line=123
-  #
-  # @return [Proc]
-  def self.editor
-    @editor
-  end
-
-  # Configures how Better Errors generates open-in-editor URLs.
-  #
-  # @overload BetterErrors.editor=(sym)
-  #   Uses one of the preset editor configurations. Valid symbols are:
-  #
-  #   * `:textmate`, `:txmt`, `:tm`
-  #   * `:sublime`, `:subl`, `:st`
-  #   * `:macvim`
-  #
-  #   @param [Symbol] sym
-  #
-  # @overload BetterErrors.editor=(str)
-  #   Uses `str` as the format string for generating open-in-editor URLs.
-  #
-  #   Use `%{file}` and `%{line}` as placeholders for the actual values.
-  #
-  #   @example
-  #     BetterErrors.editor = "my-editor://open?url=%{file}&line=%{line}"
-  #
-  #   @param [String] str
-  #
-  # @overload BetterErrors.editor=(proc)
-  #   Uses `proc` to generate open-in-editor URLs. The proc will be called
-  #   with `file` and `line` parameters when a URL needs to be generated.
-  #
-  #   Your proc should take care to escape `file` appropriately with
-  #   `URI.encode_www_form_component` (please note that `URI.escape` is **not**
-  #   a suitable substitute.)
-  #
-  #   @example
-  #     BetterErrors.editor = proc { |file, line|
-  #       "my-editor://open?url=#{URI.encode_www_form_component file}&line=#{line}"
-  #     }
-  #
-  #   @param [Proc] proc
-  #
-  def self.editor=(editor)
-    POSSIBLE_EDITOR_PRESETS.each do |config|
-      if config[:symbols].include?(editor)
-        return self.editor = config[:url]
-      end
-    end
-
-    if editor.is_a? String
-      self.editor = proc { |file, line| editor % { file: URI.encode_www_form_component(file), line: line } }
-    else
-      if editor.respond_to? :call
-        @editor = editor
-      else
-        raise TypeError, "Expected editor to be a valid editor key, a format string or a callable."
-      end
-    end
-  end
-
-  # Enables experimental Pry support in the inline REPL
-  #
-  # If you encounter problems while using Pry, *please* file a bug report at
-  # https://github.com/charliesome/better_errors/issues
-  def self.use_pry!
-    REPL::PROVIDERS.unshift const: :Pry, impl: "better_errors/repl/pry"
-  end
-
-  # Automatically sniffs a default editor preset based on the EDITOR
-  # environment variable.
-  #
-  # @return [Symbol]
-  def self.default_editor
-    POSSIBLE_EDITOR_PRESETS.detect(-> { {} }) { |config|
-      ENV["EDITOR"] =~ config[:sniff]
-    }[:url] || :textmate
-  end
-
-  BetterErrors.editor = default_editor
-end
-
-begin
-  require "binding_of_caller"
-  require "better_errors/exception_extension"
-  BetterErrors.binding_of_caller_available = true
-rescue LoadError => e
-  BetterErrors.binding_of_caller_available = false
-end
-
-require "better_errors/rails" if defined? Rails::Railtie
diff --git a/lib/better_errors/lib/better_errors/code_formatter.rb b/lib/better_errors/lib/better_errors/code_formatter.rb
deleted file mode 100644
index 77827241e..000000000
--- a/lib/better_errors/lib/better_errors/code_formatter.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-module BetterErrors
-  # @private
-  class CodeFormatter
-    require "better_errors/code_formatter/html"
-    require "better_errors/code_formatter/text"
-
-    FILE_TYPES = {
-      ".rb"   => :ruby,
-      ""      => :ruby,
-      ".html" => :html,
-      ".erb"  => :erb,
-      ".haml" => :haml
-    }
-    
-    attr_reader :filename, :line, :context
-    
-    def initialize(filename, line, context = 5)
-      @filename = filename
-      @line     = line
-      @context  = context
-    end
-
-    def output
-      formatted_code
-    rescue Errno::ENOENT, Errno::EINVAL
-      source_unavailable
-    end
-
-    def formatted_code
-      formatted_lines.join
-    end
-    
-    def coderay_scanner
-      ext = File.extname(filename)
-      FILE_TYPES[ext] || :text
-    end
-
-    def each_line_of(lines, &blk)
-      line_range.zip(lines).map { |current_line, str|
-        yield (current_line == line), current_line, str
-      }
-    end
-    
-    def highlighted_lines
-      CodeRay.scan(context_lines.join, coderay_scanner).div(wrap: nil).lines
-    end
-    
-    def context_lines
-      range = line_range
-      source_lines[(range.begin - 1)..(range.end - 1)] or raise Errno::EINVAL
-    end
-    
-    def source_lines
-      @source_lines ||= File.readlines(filename)
-    end
-    
-    def line_range
-      min = [line - context, 1].max
-      max = [line + context, source_lines.count].min
-      min..max
-    end
-  end
-end
diff --git a/lib/better_errors/lib/better_errors/code_formatter/html.rb b/lib/better_errors/lib/better_errors/code_formatter/html.rb
deleted file mode 100644
index b3ab05430..000000000
--- a/lib/better_errors/lib/better_errors/code_formatter/html.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-module BetterErrors
-  # @private
-  class CodeFormatter::HTML < CodeFormatter
-    def source_unavailable
-      "<p class='unavailable'>Source is not available</p>"
-    end
-
-    def formatted_lines
-      each_line_of(highlighted_lines) { |highlight, current_line, str|
-        class_name = highlight ? "highlight" : ""
-        sprintf '<pre class="%s">%s</pre>', class_name, str
-      }
-    end
-    
-    def formatted_nums
-      each_line_of(highlighted_lines) { |highlight, current_line, str|
-        class_name = highlight ? "highlight" : ""
-        sprintf '<span class="%s">%5d</span>', class_name, current_line
-      }
-    end
-
-    def formatted_code
-      %{<div class="code_linenums">#{formatted_nums.join}</div><div class="code">#{super}</div>}
-    end
-  end
-end
diff --git a/lib/better_errors/lib/better_errors/code_formatter/text.rb b/lib/better_errors/lib/better_errors/code_formatter/text.rb
deleted file mode 100644
index cd63806d8..000000000
--- a/lib/better_errors/lib/better_errors/code_formatter/text.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module BetterErrors
-  # @private
-  class CodeFormatter::Text < CodeFormatter
-    def source_unavailable
-      "# Source is not available"
-    end
-
-    def formatted_lines
-      each_line_of(context_lines) { |highlight, current_line, str|
-        sprintf '%s %3d   %s', (highlight ? '>' : ' '), current_line, str
-      }
-    end
-  end
-end
diff --git a/lib/better_errors/lib/better_errors/error_page.rb b/lib/better_errors/lib/better_errors/error_page.rb
deleted file mode 100644
index 849020f19..000000000
--- a/lib/better_errors/lib/better_errors/error_page.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-require "cgi"
-require "json"
-require "securerandom"
-
-module BetterErrors
-  # @private
-  class ErrorPage
-    def self.template_path(template_name)
-      File.expand_path("../templates/#{template_name}.erb", __FILE__)
-    end
-
-    def self.template(template_name)
-      Erubis::EscapedEruby.new(File.read(template_path(template_name)))
-    end
-
-    attr_reader :exception, :env, :repls
-
-    def initialize(exception, env)
-      @exception = RaisedException.new(exception)
-      @env = env
-      @start_time = Time.now.to_f
-      @repls = []
-    end
-
-    def id
-      @id ||= SecureRandom.hex(8)
-    end
-
-    def render(template_name = "main")
-      self.class.template(template_name).result binding
-    end
-
-    def do_variables(opts)
-      index = opts["index"].to_i
-      @frame = backtrace_frames[index]
-      @var_start_time = Time.now.to_f
-      { html: render("variable_info") }
-    end
-
-    def do_eval(opts)
-      index = opts["index"].to_i
-      code = opts["source"]
-
-      unless binding = backtrace_frames[index].frame_binding
-        return { error: "REPL unavailable in this stack frame" }
-      end
-
-      result, prompt, prefilled_input =
-        (@repls[index] ||= REPL.provider.new(binding)).send_input(code)
-
-      { result: result,
-        prompt: prompt,
-        prefilled_input: prefilled_input,
-        highlighted_input: CodeRay.scan(code, :ruby).div(wrap: nil) }
-    end
-
-    def backtrace_frames
-      exception.backtrace
-    end
-
-    def application_frames
-      backtrace_frames.select(&:application?)
-    end
-
-    def first_frame
-      application_frames.first || backtrace_frames.first
-    end
-
-  private
-    def editor_url(frame)
-      BetterErrors.editor[frame.filename, frame.line]
-    end
-
-    def rack_session
-      env['rack.session']
-    end
-
-    def rails_params
-      env['action_dispatch.request.parameters']
-    end
-
-    def uri_prefix
-      env["SCRIPT_NAME"] || ""
-    end
-
-    def request_path
-      env["PATH_INFO"]
-    end
-
-    def html_formatted_code_block(frame)
-      CodeFormatter::HTML.new(frame.filename, frame.line).output
-    end
-
-    def text_formatted_code_block(frame)
-      CodeFormatter::Text.new(frame.filename, frame.line).output
-    end
-
-    def text_heading(char, str)
-      str + "\n" + char*str.size
-    end
-
-    def inspect_value(obj)
-      CGI.escapeHTML(obj.inspect)
-    rescue NoMethodError
-      "<span class='unsupported'>(object doesn't support inspect)</span>"
-    rescue Exception => e
-      "<span class='unsupported'>(exception was raised in inspect)</span>"
-    end
-  end
-end
diff --git a/lib/better_errors/lib/better_errors/exception_extension.rb b/lib/better_errors/lib/better_errors/exception_extension.rb
deleted file mode 100644
index e97b052f3..000000000
--- a/lib/better_errors/lib/better_errors/exception_extension.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module BetterErrors
-  module ExceptionExtension
-    prepend_features Exception
-
-    def set_backtrace(*)
-      if caller_locations.none? { |loc| loc.path == __FILE__ }
-        @__better_errors_bindings_stack = binding.callers.drop(1)
-      end
-
-      super
-    end
-
-    def __better_errors_bindings_stack
-      @__better_errors_bindings_stack || []
-    end
-  end
-end
diff --git a/lib/better_errors/lib/better_errors/middleware.rb b/lib/better_errors/lib/better_errors/middleware.rb
deleted file mode 100644
index ce9aaad4b..000000000
--- a/lib/better_errors/lib/better_errors/middleware.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-require "json"
-require "ipaddr"
-require "set"
-
-module BetterErrors
-  # Better Errors' error handling middleware. Including this in your middleware
-  # stack will show a Better Errors error page for exceptions raised below this
-  # middleware.
-  #
-  # If you are using Ruby on Rails, you do not need to manually insert this
-  # middleware into your middleware stack.
-  #
-  # @example Sinatra
-  #   require "better_errors"
-  #
-  #   if development?
-  #     use BetterErrors::Middleware
-  #   end
-  #
-  # @example Rack
-  #   require "better_errors"
-  #   if ENV["RACK_ENV"] == "development"
-  #     use BetterErrors::Middleware
-  #   end
-  #
-  class Middleware
-    # The set of IP addresses that are allowed to access Better Errors.
-    #
-    # Set to `{ "127.0.0.1/8", "::1/128" }` by default.
-    ALLOWED_IPS = Set.new
-
-    # Adds an address to the set of IP addresses allowed to access Better
-    # Errors.
-    def self.allow_ip!(addr)
-      ALLOWED_IPS << IPAddr.new(addr)
-    end
-
-    allow_ip! "127.0.0.0/8"
-    allow_ip! "::1/128" rescue nil # windows ruby doesn't have ipv6 support
-
-    # A new instance of BetterErrors::Middleware
-    #
-    # @param app      The Rack app/middleware to wrap with Better Errors
-    # @param handler  The error handler to use.
-    def initialize(app, handler = ErrorPage)
-      @app      = app
-      @handler  = handler
-    end
-
-    # Calls the Better Errors middleware
-    #
-    # @param [Hash] env
-    # @return [Array]
-    def call(env)
-      if allow_ip? env
-        better_errors_call env
-      else
-        @app.call env
-      end
-    end
-
-  private
-
-    def allow_ip?(env)
-      # REMOTE_ADDR is not in the rack spec, so some application servers do
-      # not provide it.
-      return true unless env["REMOTE_ADDR"] and !env["REMOTE_ADDR"].strip.empty?
-      ip = IPAddr.new env["REMOTE_ADDR"].split("%").first
-      ALLOWED_IPS.any? { |subnet| subnet.include? ip }
-    end
-
-    def better_errors_call(env)
-      case env["PATH_INFO"]
-      when %r{/__better_errors/(?<id>.+?)/(?<method>\w+)\z}
-        internal_call env, $~
-      when %r{/__better_errors/?\z}
-        show_error_page env
-      else
-        protected_app_call env
-      end
-    end
-
-    def protected_app_call(env)
-      @app.call env
-    rescue Exception => ex
-      @error_page = @handler.new ex, env
-      log_exception
-      show_error_page(env, ex)
-    end
-
-    def show_error_page(env, exception=nil)
-      type, content = if @error_page
-        if text?(env)
-          [ 'plain', @error_page.render('text') ]
-        else
-          [ 'html', @error_page.render ]
-        end
-      else
-        [ 'html', no_errors_page ]
-      end
-
-      status_code = 500
-      if defined? ActionDispatch::ExceptionWrapper
-        status_code = ActionDispatch::ExceptionWrapper.new(env, exception).status_code
-      end
-
-      [status_code, { "Content-Type" => "text/#{type}; charset=utf-8" }, [content]]
-    end
-
-    def text?(env)
-      env["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest" ||
-      !env["HTTP_ACCEPT"].to_s.include?('html')
-    end
-
-    def log_exception
-      return unless BetterErrors.logger
-
-      message = "\n#{@error_page.exception.type} - #{@error_page.exception.message}:\n"
-      @error_page.backtrace_frames.each do |frame|
-        message << "  #{frame}\n"
-      end
-
-      BetterErrors.logger.fatal message
-    end
-
-    def internal_call(env, opts)
-      if opts[:id] != @error_page.id
-        return [200, { "Content-Type" => "text/plain; charset=utf-8" }, [JSON.dump(error: "Session expired")]]
-      end
-
-      env["rack.input"].rewind
-      response = @error_page.send("do_#{opts[:method]}", JSON.parse(env["rack.input"].read))
-      [200, { "Content-Type" => "text/plain; charset=utf-8" }, [JSON.dump(response)]]
-    end
-
-    def no_errors_page
-      "<h1>No errors</h1><p>No errors have been recorded yet.</p><hr>" +
-      "<code>Better Errors v#{BetterErrors::VERSION}</code>"
-    end
-  end
-end
diff --git a/lib/better_errors/lib/better_errors/rails.rb b/lib/better_errors/lib/better_errors/rails.rb
deleted file mode 100644
index 36e386a55..000000000
--- a/lib/better_errors/lib/better_errors/rails.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module BetterErrors
-  # @private
-  class Railtie < Rails::Railtie
-    initializer "better_errors.configure_rails_initialization" do
-      if use_better_errors?
-        insert_middleware
-        BetterErrors.logger = Rails.logger
-        BetterErrors.application_root = Rails.root.to_s
-      end
-    end
-
-    def insert_middleware
-      if defined? ActionDispatch::DebugExceptions
-        app.middleware.insert_after ActionDispatch::DebugExceptions, BetterErrors::Middleware
-      else
-        app.middleware.use BetterErrors::Middleware
-      end
-    end
-
-    def use_better_errors?
-      !Rails.env.production? and app.config.consider_all_requests_local
-    end
-
-    def app
-      Rails.application
-    end
-  end
-end
diff --git a/lib/better_errors/lib/better_errors/raised_exception.rb b/lib/better_errors/lib/better_errors/raised_exception.rb
deleted file mode 100644
index 07d0d7b28..000000000
--- a/lib/better_errors/lib/better_errors/raised_exception.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# @private
-module BetterErrors
-  class RaisedException
-    attr_reader :exception, :message, :backtrace
-
-    def initialize(exception)
-      if exception.respond_to?(:original_exception) && exception.original_exception
-        exception = exception.original_exception
-      end
-
-      @exception = exception
-      @message = exception.message
-
-      setup_backtrace
-      massage_syntax_error
-    end
-
-    def type
-      exception.class
-    end
-
-  private
-    def has_bindings?
-      exception.respond_to?(:__better_errors_bindings_stack) && exception.__better_errors_bindings_stack.any?
-    end
-
-    def setup_backtrace
-      if has_bindings?
-        setup_backtrace_from_bindings
-      else
-        setup_backtrace_from_backtrace
-      end
-    end
-
-    def setup_backtrace_from_bindings
-      @backtrace = exception.__better_errors_bindings_stack.map { |binding|
-        file = binding.eval "__FILE__"
-        line = binding.eval "__LINE__"
-        name = binding.frame_description
-        StackFrame.new(file, line, name, binding)
-      }
-    end
-
-    def setup_backtrace_from_backtrace
-      @backtrace = (exception.backtrace || []).map { |frame|
-        if /\A(?<file>.*?):(?<line>\d+)(:in `(?<name>.*)')?/ =~ frame
-          StackFrame.new(file, line.to_i, name)
-        end
-      }.compact
-    end
-
-    def massage_syntax_error
-      case exception.class.to_s
-      when "Haml::SyntaxError"
-        if /\A(.+?):(\d+)/ =~ exception.backtrace.first
-          backtrace.unshift(StackFrame.new($1, $2.to_i, ""))
-        end
-      when "SyntaxError"
-        if /\A(.+?):(\d+): (.*)/m =~ exception.message
-          backtrace.unshift(StackFrame.new($1, $2.to_i, ""))
-          @message = $3
-        end
-      end
-    end
-  end
-end
diff --git a/lib/better_errors/lib/better_errors/repl.rb b/lib/better_errors/lib/better_errors/repl.rb
deleted file mode 100644
index c0f6463ed..000000000
--- a/lib/better_errors/lib/better_errors/repl.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-module BetterErrors
-  # @private
-  module REPL
-    PROVIDERS = [
-        { impl:   "better_errors/repl/basic",
-          const:  :Basic },
-      ]
-
-    def self.provider
-      @provider ||= const_get detect[:const]
-    end
-    
-    def self.provider=(prov)
-      @provider = prov
-    end
-    
-    def self.detect
-      PROVIDERS.find { |prov|
-        test_provider prov
-      }
-    end
-    
-    def self.test_provider(provider)
-      require provider[:impl]
-      true
-    rescue LoadError
-      false
-    end
-  end
-end
diff --git a/lib/better_errors/lib/better_errors/repl/basic.rb b/lib/better_errors/lib/better_errors/repl/basic.rb
deleted file mode 100644
index 7011e4488..000000000
--- a/lib/better_errors/lib/better_errors/repl/basic.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module BetterErrors
-  module REPL
-    class Basic
-      def initialize(binding)
-        @binding = binding
-      end
-    
-      def send_input(str)
-        [execute(str), ">>", ""]
-      end
-    
-    private
-      def execute(str)
-        "=> #{@binding.eval(str).inspect}\n"
-      rescue Exception => e
-        "!! #{e.inspect rescue e.class.to_s rescue "Exception"}\n"
-      end
-    end
-  end
-end
diff --git a/lib/better_errors/lib/better_errors/repl/pry.rb b/lib/better_errors/lib/better_errors/repl/pry.rb
deleted file mode 100644
index 412be013d..000000000
--- a/lib/better_errors/lib/better_errors/repl/pry.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-require "fiber"
-require "pry"
-
-module BetterErrors
-  module REPL
-    class Pry
-      class Input
-        def readline
-          Fiber.yield
-        end
-      end
-      
-      class Output
-        def initialize
-          @buffer = ""
-        end
-        
-        def puts(*args)
-          args.each do |arg|
-            @buffer << "#{arg.chomp}\n"
-          end
-        end
-        
-        def tty?
-          false
-        end
-        
-        def read_buffer
-          @buffer
-        ensure
-          @buffer = ""
-        end
-      end
-      
-      def initialize(binding)
-        @fiber = Fiber.new do
-          @pry.repl binding
-        end
-        @input = Input.new
-        @output = Output.new
-        @pry = ::Pry.new input: @input, output: @output
-        @pry.hooks.clear_all if defined?(@pry.hooks.clear_all)
-        @fiber.resume
-      end
-    
-      def send_input(str)
-        local ::Pry.config, color: false, pager: false do
-          @fiber.resume "#{str}\n"
-          [@output.read_buffer, *prompt]
-        end
-      end
-
-      def prompt
-        if indent = @pry.instance_variable_get(:@indent) and !indent.indent_level.empty?
-          ["..", indent.indent_level]
-        else
-          [">>", ""]
-        end
-      rescue
-        [">>", ""]
-      end
-      
-    private
-      def local(obj, attrs)
-        old_attrs = {}
-        attrs.each do |k, v|
-          old_attrs[k] = obj.send k
-          obj.send "#{k}=", v
-        end
-        yield
-      ensure
-        old_attrs.each do |k, v|
-          obj.send "#{k}=", v
-        end
-      end
-    end
-  end
-end
diff --git a/lib/better_errors/lib/better_errors/stack_frame.rb b/lib/better_errors/lib/better_errors/stack_frame.rb
deleted file mode 100644
index 4130425f7..000000000
--- a/lib/better_errors/lib/better_errors/stack_frame.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-require "set"
-
-module BetterErrors
-  # @private
-  class StackFrame
-    def self.from_exception(exception)
-      RaisedException.new(exception).backtrace
-    end
-
-    attr_reader :filename, :line, :name, :frame_binding
-
-    def initialize(filename, line, name, frame_binding = nil)
-      @filename       = filename
-      @line           = line
-      @name           = name
-      @frame_binding  = frame_binding
-
-      set_pretty_method_name if frame_binding
-    end
-
-    def application?
-      if root = BetterErrors.application_root
-        filename.index(root) == 0 && filename.index("#{root}/vendor") != 0
-      end
-    end
-
-    def application_path
-      filename[(BetterErrors.application_root.length+1)..-1]
-    end
-
-    def gem?
-      Gem.path.any? { |path| filename.index(path) == 0 }
-    end
-
-    def gem_path
-      if path = Gem.path.detect { |path| filename.index(path) == 0 }
-        gem_name_and_version, path = filename.sub("#{path}/gems/", "").split("/", 2)
-        /(?<gem_name>.+)-(?<gem_version>[\w.]+)/ =~ gem_name_and_version
-        "#{gem_name} (#{gem_version}) #{path}"
-      end
-    end
-
-    def class_name
-      @class_name
-    end
-
-    def method_name
-      @method_name || @name
-    end
-
-    def context
-      if gem?
-        :gem
-      elsif application?
-        :application
-      else
-        :dunno
-      end
-    end
-
-    def pretty_path
-      case context
-      when :application;  application_path
-      when :gem;          gem_path
-      else                filename
-      end
-    end
-
-    def local_variables
-      return {} unless frame_binding
-      frame_binding.eval("local_variables").each_with_object({}) do |name, hash|
-        if defined?(frame_binding.local_variable_get)
-          hash[name] = frame_binding.local_variable_get(name)
-        else
-          hash[name] = frame_binding.eval(name.to_s)
-        end
-      end
-    end
-
-    def instance_variables
-      return {} unless frame_binding
-      Hash[visible_instance_variables.map { |x|
-        [x, frame_binding.eval(x.to_s)]
-      }]
-    end
-
-    def visible_instance_variables
-      frame_binding.eval("instance_variables") - BetterErrors.ignored_instance_variables
-    end
-
-    def to_s
-      "#{pretty_path}:#{line}:in `#{name}'"
-    end
-
-  private
-    def set_pretty_method_name
-      name =~ /\A(block (\([^)]+\) )?in )?/
-      recv = frame_binding.eval("self")
-
-      return unless method_name = frame_binding.eval("::Kernel.__method__")
-
-      if Module === recv
-        @class_name = "#{$1}#{recv}"
-        @method_name = ".#{method_name}"
-      else
-        @class_name = "#{$1}#{Kernel.instance_method(:class).bind(recv).call}"
-        @method_name = "##{method_name}"
-      end
-    end
-  end
-end
diff --git a/lib/better_errors/lib/better_errors/templates/main.erb b/lib/better_errors/lib/better_errors/templates/main.erb
deleted file mode 100644
index 7c3ff9fe1..000000000
--- a/lib/better_errors/lib/better_errors/templates/main.erb
+++ /dev/null
@@ -1,1031 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title><%= exception.type %> at <%= request_path %></title>
-</head>
-<body>
-    <%# Stylesheets are placed in the <body> for Turbolinks compatibility. %>
-    <style>
-    /* Basic reset */
-    * {
-        margin: 0;
-        padding: 0;
-    }
-
-    table {
-        width: 100%;
-        border-collapse: collapse;
-    }
-
-    th, td {
-        vertical-align: top;
-        text-align: left;
-    }
-
-    textarea {
-        resize: none;
-    }
-
-    body {
-        font-size: 10pt;
-    }
-
-    body, td, input, textarea {
-        font-family: helvetica neue, lucida grande, sans-serif;
-        line-height: 1.5;
-        color: #333;
-        text-shadow: 0 1px 0 rgba(255, 255, 255, 0.6);
-    }
-
-    html {
-        background: #f0f0f5;
-    }
-
-    .clearfix::after{
-        clear: both;
-        content: ".";
-        display: block;
-        height: 0;
-        visibility: hidden;
-    }
-
-    /* ---------------------------------------------------------------------
-     * Basic layout
-     * --------------------------------------------------------------------- */
-
-    /* Small */
-    @media screen and (max-width: 1100px) {
-        html {
-            overflow-y: scroll;
-        }
-
-        body {
-            margin: 0 20px;
-        }
-
-        header.exception {
-            margin: 0 -20px;
-        }
-
-        nav.sidebar {
-            padding: 0;
-            margin: 20px 0;
-        }
-
-        ul.frames {
-            max-height: 200px;
-            overflow: auto;
-        }
-    }
-
-    /* Wide */
-    @media screen and (min-width: 1100px) {
-        header.exception {
-           position: fixed;
-           top: 0;
-           left: 0;
-           right: 0;
-        }
-
-        nav.sidebar,
-        .frame_info {
-            position: fixed;
-            top: 95px;
-            bottom: 0;
-
-            box-sizing: border-box;
-
-            overflow-y: auto;
-            overflow-x: hidden;
-        }
-
-        nav.sidebar {
-            width: 40%;
-            left: 20px;
-            top: 115px;
-            bottom: 20px;
-        }
-
-        .frame_info {
-            right: 0;
-            left: 40%;
-
-            padding: 20px;
-            padding-left: 10px;
-            margin-left: 30px;
-        }
-    }
-
-    nav.sidebar {
-        background: #d3d3da;
-        border-top: solid 3px #a33;
-        border-bottom: solid 3px #a33;
-        border-radius: 4px;
-        box-shadow: 0 0 6px rgba(0, 0, 0, 0.2), inset 0 0 0 1px rgba(0, 0, 0, 0.1);
-    }
-
-    /* ---------------------------------------------------------------------
-     * Header
-     * --------------------------------------------------------------------- */
-
-    header.exception {
-        padding: 18px 20px;
-
-        height: 59px;
-        min-height: 59px;
-
-        overflow: hidden;
-
-        background-color: #20202a;
-        color: #aaa;
-        text-shadow: 0 1px 0 rgba(0, 0, 0, 0.3);
-        font-weight: 200;
-        box-shadow: inset 0 -5px 3px -3px rgba(0, 0, 0, 0.05), inset 0 -1px 0 rgba(0, 0, 0, 0.05);
-
-        -webkit-text-smoothing: antialiased;
-    }
-
-    /* Heading */
-    header.exception h2 {
-        font-weight: 200;
-        font-size: 11pt;
-    }
-
-    header.exception h2,
-    header.exception p {
-        line-height: 1.4em;
-        overflow: hidden;
-        white-space: pre;
-        text-overflow: ellipsis;
-    }
-
-    header.exception h2 strong {
-        font-weight: 700;
-        color: #d55;
-    }
-
-    header.exception p {
-        font-weight: 200;
-        font-size: 20pt;
-        color: white;
-    }
-
-    header.exception:hover {
-        height: auto;
-        z-index: 2;
-    }
-
-    header.exception:hover h2,
-    header.exception:hover p {
-        padding-right: 20px;
-        overflow-y: auto;
-        word-wrap: break-word;
-        white-space: pre-wrap;
-        height: auto;
-        max-height: 7em;
-    }
-
-    @media screen and (max-width: 1100px) {
-        header.exception {
-            height: auto;
-        }
-
-        header.exception h2,
-        header.exception p {
-            padding-right: 20px;
-            overflow-y: auto;
-            word-wrap: break-word;
-            height: auto;
-            max-height: 7em;
-        }
-    }
-
-    <%#
-    /* Light theme */
-    header.exception {
-        text-shadow: 0 1px 0 rgba(250, 250, 250, 0.6);
-        background: rgba(200,100,50,0.10);
-        color: #977;
-    }
-    header.exception h2 strong {
-        color: #533;
-    }
-    header.exception p {
-        color: #744;
-    }
-    %>
-
-    /* ---------------------------------------------------------------------
-     * Navigation
-     * --------------------------------------------------------------------- */
-
-    nav.tabs {
-        border-bottom: solid 1px #ddd;
-
-        background-color: #eee;
-        text-align: center;
-
-        padding: 6px;
-
-        box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
-    }
-
-    nav.tabs a {
-        display: inline-block;
-
-        height: 22px;
-        line-height: 22px;
-        padding: 0 10px;
-
-        text-decoration: none;
-        font-size: 8pt;
-        font-weight: bold;
-
-        color: #999;
-        text-shadow: 0 1px 0 rgba(255, 255, 255, 0.6);
-    }
-
-    nav.tabs a.selected {
-        color: white;
-        background: rgba(0, 0, 0, 0.5);
-        border-radius: 16px;
-        box-shadow: 1px 1px 0 rgba(255, 255, 255, 0.1);
-        text-shadow: 0 0 4px rgba(0, 0, 0, 0.4), 0 1px 0 rgba(0, 0, 0, 0.4);
-    }
-
-    nav.tabs a.disabled {
-        text-decoration: line-through;
-        text-shadow: none;
-        cursor: default;
-    }
-
-    /* ---------------------------------------------------------------------
-     * Sidebar
-     * --------------------------------------------------------------------- */
-
-    ul.frames {
-        box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-    }
-
-    /* Each item */
-    ul.frames li {
-        background-color: #f8f8f8;
-        background: -webkit-linear-gradient(top, #f8f8f8 80%, #f0f0f0);
-        background: -moz-linear-gradient(top, #f8f8f8 80%, #f0f0f0);
-        background: linear-gradient(top, #f8f8f8 80%, #f0f0f0);
-        box-shadow: inset 0 -1px 0 #e2e2e2;
-        padding: 7px 20px;
-
-        cursor: pointer;
-        overflow: hidden;
-    }
-
-    ul.frames .name,
-    ul.frames .location {
-        overflow: hidden;
-        height: 1.5em;
-
-        white-space: nowrap;
-        word-wrap: none;
-        text-overflow: ellipsis;
-    }
-
-    ul.frames .method {
-        color: #966;
-    }
-
-    ul.frames .location {
-        font-size: 0.85em;
-        font-weight: 400;
-        color: #999;
-    }
-
-    ul.frames .line {
-        font-weight: bold;
-    }
-
-    /* Selected frame */
-    ul.frames li.selected {
-        background: #38a;
-        box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), inset 0 2px 0 rgba(255, 255, 255, 0.01), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-    }
-
-    ul.frames li.selected .name,
-    ul.frames li.selected .method,
-    ul.frames li.selected .location {
-        color: white;
-        text-shadow: 0 1px 0 rgba(0, 0, 0, 0.2);
-    }
-
-    ul.frames li.selected .location {
-        opacity: 0.6;
-    }
-
-    /* Iconography */
-    ul.frames li {
-        padding-left: 60px;
-        position: relative;
-    }
-
-    ul.frames li .icon {
-        display: block;
-        width: 20px;
-        height: 20px;
-        line-height: 20px;
-        border-radius: 15px;
-
-        text-align: center;
-
-        background: white;
-        border: solid 2px #ccc;
-
-        font-size: 9pt;
-        font-weight: 200;
-        font-style: normal;
-
-        position: absolute;
-        top: 14px;
-        left: 20px;
-    }
-
-    ul.frames .icon.application {
-        background: #808090;
-        border-color: #555;
-    }
-
-    ul.frames .icon.application:before {
-        content: 'A';
-        color: white;
-        text-shadow: 0 0 3px rgba(0, 0, 0, 0.2);
-    }
-
-    /* Responsiveness -- flow to single-line mode */
-    @media screen and (max-width: 1100px) {
-        ul.frames li {
-            padding-top: 6px;
-            padding-bottom: 6px;
-            padding-left: 36px;
-            line-height: 1.3;
-        }
-
-        ul.frames li .icon {
-            width: 11px;
-            height: 11px;
-            line-height: 11px;
-
-            top: 7px;
-            left: 10px;
-            font-size: 5pt;
-        }
-
-        ul.frames .name,
-        ul.frames .location {
-            display: inline-block;
-            line-height: 1.3;
-            height: 1.3em;
-        }
-
-        ul.frames .name {
-            margin-right: 10px;
-        }
-    }
-
-    /* ---------------------------------------------------------------------
-     * Monospace
-     * --------------------------------------------------------------------- */
-
-    pre, code, .repl input, .repl .prompt span, textarea, .code_linenums {
-        font-family: menlo, lucida console, monospace;
-        font-size: 8pt;
-    }
-
-    /* ---------------------------------------------------------------------
-     * Display area
-     * --------------------------------------------------------------------- */
-
-    .trace_info {
-        background: #fff;
-        padding: 6px;
-        border-radius: 3px;
-        margin-bottom: 2px;
-        box-shadow: 0 0 10px rgba(0, 0, 0, 0.03), 1px 1px 0 rgba(0, 0, 0, 0.05), -1px 1px 0 rgba(0, 0, 0, 0.05), 0 0 0 4px rgba(0, 0, 0, 0.04);
-    }
-
-    .code_block{
-        background: #f1f1f1;
-        border-left: 1px solid #ccc;
-    }
-
-    /* Titlebar */
-    .trace_info .title {
-        background: #f1f1f1;
-
-        box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3);
-        overflow: hidden;
-        padding: 6px 10px;
-
-        border: solid 1px #ccc;
-        border-bottom: 0;
-
-        border-top-left-radius: 2px;
-        border-top-right-radius: 2px;
-    }
-
-    .trace_info .title .name,
-    .trace_info .title .location {
-        font-size: 9pt;
-        line-height: 26px;
-        height: 26px;
-        overflow: hidden;
-    }
-
-    .trace_info .title .location {
-        float: left;
-        font-weight: bold;
-        font-size: 10pt;
-    }
-
-    .trace_info .title .location a {
-        color:inherit;
-        text-decoration:none;
-        border-bottom:1px solid #aaaaaa;
-    }
-
-    .trace_info .title .location a:hover {
-        border-color:#666666;
-    }
-
-    .trace_info .title .name {
-        float: right;
-        font-weight: 200;
-    }
-
-    .code, .console, .unavailable {
-        background: #fff;
-        padding: 5px;
-
-        box-shadow: inset 3px 3px 3px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(0, 0, 0, 0.1);
-    }
-
-    .code_linenums{
-        background:#f1f1f1;
-        padding-top:10px;
-        padding-bottom:9px;
-        float:left;
-    }
-
-    .code_linenums span{
-        display:block;
-        padding:0 12px;
-    }
-
-    .code {
-        margin-bottom: -1px;
-        border-top-left-radius:2px;
-        padding: 10px 0;
-        overflow: auto;
-    }
-
-    .code pre{
-        padding-left:12px;
-        min-height:16px;
-    }
-
-    /* Source unavailable */
-    p.unavailable {
-        padding: 20px 0 40px 0;
-        text-align: center;
-        color: #b99;
-        font-weight: bold;
-    }
-
-    p.unavailable:before {
-        content: '\00d7';
-        display: block;
-
-        color: #daa;
-
-        text-align: center;
-        font-size: 40pt;
-        font-weight: normal;
-        margin-bottom: -10px;
-    }
-
-    @-webkit-keyframes highlight {
-        0%   { background: rgba(220, 30, 30, 0.3); }
-        100% { background: rgba(220, 30, 30, 0.1); }
-    }
-    @-moz-keyframes highlight {
-        0%   { background: rgba(220, 30, 30, 0.3); }
-        100% { background: rgba(220, 30, 30, 0.1); }
-    }
-    @keyframes highlight {
-        0%   { background: rgba(220, 30, 30, 0.3); }
-        100% { background: rgba(220, 30, 30, 0.1); }
-    }
-
-    .code .highlight, .code_linenums .highlight {
-        background: rgba(220, 30, 30, 0.1);
-        -webkit-animation: highlight 400ms linear 1;
-        -moz-animation: highlight 400ms linear 1;
-        animation: highlight 400ms linear 1;
-    }
-
-    /* REPL shell */
-    .console {
-        padding: 0 1px 10px 1px;
-        border-bottom-left-radius: 2px;
-        border-bottom-right-radius: 2px;
-    }
-
-    .console pre {
-        padding: 10px 10px 0 10px;
-        max-height: 400px;
-        overflow-x: none;
-        overflow-y: auto;
-        margin-bottom: -3px;
-        word-wrap: break-word;
-        white-space: pre-wrap;
-    }
-
-    /* .prompt > span + input */
-    .console .prompt {
-        display: table;
-        width: 100%;
-    }
-
-    .console .prompt span,
-    .console .prompt input {
-        display: table-cell;
-    }
-
-    .console .prompt span {
-        width: 1%;
-        padding-right: 5px;
-        padding-left: 10px;
-    }
-
-    .console .prompt input {
-        width: 99%;
-    }
-
-    /* Input box */
-    .console input,
-    .console input:focus {
-        outline: 0;
-        border: 0;
-        padding: 0;
-        background: transparent;
-        margin: 0;
-    }
-
-    /* Hint text */
-    .hint {
-        margin: 15px 0 20px 0;
-        font-size: 8pt;
-        color: #8080a0;
-        padding-left: 20px;
-    }
-
-    .hint:before {
-        content: '\25b2';
-        margin-right: 5px;
-        opacity: 0.5;
-    }
-
-    /* ---------------------------------------------------------------------
-     * Variable infos
-     * --------------------------------------------------------------------- */
-
-    .sub {
-        padding: 10px 0;
-        margin: 10px 0;
-    }
-
-    .sub:before {
-        content: '';
-        display: block;
-        width: 100%;
-        height: 4px;
-
-        border-radius: 2px;
-        background: rgba(0, 150, 200, 0.05);
-        box-shadow: 1px 1px 0 rgba(255, 255, 255, 0.7), inset 0 0 0 1px rgba(0, 0, 0, 0.04), inset 2px 2px 2px rgba(0, 0, 0, 0.07);
-    }
-
-    .sub h3 {
-        color: #39a;
-        font-size: 1.1em;
-        margin: 10px 0;
-        text-shadow: 0 1px 0 rgba(255, 255, 255, 0.6);
-
-        -webkit-font-smoothing: antialiased;
-    }
-
-    .sub .inset {
-        overflow-y: auto;
-    }
-
-    .sub table {
-        table-layout: fixed;
-    }
-
-    .sub table td {
-        border-top: dotted 1px #ddd;
-        padding: 7px 1px;
-    }
-
-    .sub table td.name {
-        width: 150px;
-
-        font-weight: bold;
-        font-size: 0.8em;
-        padding-right: 20px;
-
-        word-wrap: break-word;
-    }
-
-    .sub table td pre {
-        max-height: 15em;
-        overflow-y: auto;
-    }
-
-    .sub table td pre {
-        width: 100%;
-
-        word-wrap: break-word;
-        white-space: normal;
-    }
-
-    /* "(object doesn't support inspect)" */
-    .sub .unsupported {
-      font-family: sans-serif;
-      color: #777;
-    }
-
-    /* ---------------------------------------------------------------------
-     * Scrollbar
-     * --------------------------------------------------------------------- */
-
-    nav.sidebar::-webkit-scrollbar,
-    .inset pre::-webkit-scrollbar,
-    .console pre::-webkit-scrollbar,
-    .code::-webkit-scrollbar {
-        width: 10px;
-        height: 10px;
-    }
-
-    .inset pre::-webkit-scrollbar-thumb,
-    .console pre::-webkit-scrollbar-thumb,
-    .code::-webkit-scrollbar-thumb {
-        background: #ccc;
-        border-radius: 5px;
-    }
-
-    nav.sidebar::-webkit-scrollbar-thumb {
-        background: rgba(0, 0, 0, 0.0);
-        border-radius: 5px;
-    }
-
-    nav.sidebar:hover::-webkit-scrollbar-thumb {
-        background-color: #999;
-        background: -webkit-linear-gradient(left, #aaa, #999);
-    }
-
-    .console pre:hover::-webkit-scrollbar-thumb,
-    .inset pre:hover::-webkit-scrollbar-thumb,
-    .code:hover::-webkit-scrollbar-thumb {
-        background: #888;
-    }
-    </style>
-
-    <%# IE8 compatibility crap %>
-    <script>
-    (function() {
-        var elements = ["section", "nav", "header", "footer", "audio"];
-        for (var i = 0; i < elements.length; i++) {
-            document.createElement(elements[i]);
-        }
-    })();
-    </script>
-
-    <%#
-      If Rails's Turbolinks is used, the Better Errors page is probably
-      rendered in the host app's layout. Let's empty out the styles of the
-      host app.
-    %>
-    <script>
-      if (window.Turbolinks) {
-          for(var i=0; i < document.styleSheets.length; i++) {
-              if(document.styleSheets[i].href)
-                  document.styleSheets[i].disabled = true;
-          }
-          document.addEventListener("page:restore", function restoreCSS(e) {
-              for(var i=0; i < document.styleSheets.length; i++) {
-                  document.styleSheets[i].disabled = false;
-              }
-              document.removeEventListener("page:restore", restoreCSS, false);
-          });
-      }
-    </script>
-
-    <div class='top'>
-        <header class="exception">
-            <h2><strong><%= exception.type %></strong> <span>at <%= request_path %></span></h2>
-            <p><%= exception.message %></p>
-        </header>
-    </div>
-
-    <section class="backtrace">
-        <nav class="sidebar">
-            <nav class="tabs">
-                <a href="#" id="application_frames">Application Frames</a>
-                <a href="#" id="all_frames">All Frames</a>
-            </nav>
-            <ul class="frames">
-                <% backtrace_frames.each_with_index do |frame, index| %>
-                    <li class="<%= frame.context %>" data-context="<%= frame.context %>" data-index="<%= index %>">
-                        <span class='stroke'></span>
-                        <i class="icon <%= frame.context %>"></i>
-                        <div class="info">
-                            <div class="name">
-                                <strong><%= frame.class_name %></strong><span class='method'><%= frame.method_name %></span>
-                            </div>
-                            <div class="location">
-                                <span class="filename"><%= frame.pretty_path %></span>, line <span class="line"><%= frame.line %></span>
-                            </div>
-                        </div>
-                    </li>
-                <% end %>
-            </ul>
-        </nav>
-
-        <% backtrace_frames.each_with_index do |frame, index| %>
-            <div class="frame_info" id="frame_info_<%= index %>" style="display:none;"></div>
-        <% end %>
-    </section>
-</body>
-<script>
-(function() {
-
-    var OID = "<%= id %>";
-
-    var previousFrame = null;
-    var previousFrameInfo = null;
-    var allFrames = document.querySelectorAll("ul.frames li");
-    var allFrameInfos = document.querySelectorAll(".frame_info");
-
-    function apiCall(method, opts, cb) {
-        var req = new XMLHttpRequest();
-        req.open("POST", <%== uri_prefix.gsub("<", "&lt;").inspect %> + "/__better_errors/" + OID + "/" + method, true);
-        req.setRequestHeader("Content-Type", "application/json");
-        req.send(JSON.stringify(opts));
-        req.onreadystatechange = function() {
-            if(req.readyState == 4) {
-                var res = JSON.parse(req.responseText);
-                cb(res);
-            }
-        };
-    }
-
-    function escapeHTML(html) {
-        return html.replace(/&/, "&amp;").replace(/</g, "&lt;");
-    }
-
-    function REPL(index) {
-        this.index = index;
-
-        var previousCommands = JSON.parse(localStorage.getItem("better_errors_previous_commands"));
-        if(previousCommands === null) {
-          localStorage.setItem("better_errors_previous_commands", JSON.stringify([]));
-          previousCommands = [];
-        }
-
-        this.previousCommandOffset = previousCommands.length;
-    }
-
-    REPL.all = [];
-
-    REPL.prototype.install = function(containerElement) {
-        this.container = containerElement;
-
-        this.promptElement  = this.container.querySelector(".prompt span");
-        this.inputElement   = this.container.querySelector("input");
-        this.outputElement  = this.container.querySelector("pre");
-
-        var self = this;
-        this.inputElement.onkeydown = function(ev) {
-            self.onKeyDown(ev);
-        };
-
-        this.setPrompt(">>");
-
-        REPL.all[this.index] = this;
-    }
-
-    REPL.prototype.focus = function() {
-        this.inputElement.focus();
-    };
-
-    REPL.prototype.setPrompt = function(prompt) {
-        this._prompt = prompt;
-        this.promptElement.innerHTML = escapeHTML(prompt);
-    };
-
-    REPL.prototype.getInput = function() {
-        return this.inputElement.value;
-    };
-
-    REPL.prototype.setInput = function(text) {
-        this.inputElement.value = text;
-
-        if(this.inputElement.setSelectionRange) {
-            // set cursor to end of input
-            this.inputElement.setSelectionRange(text.length, text.length);
-        }
-    };
-
-    REPL.prototype.writeRawOutput = function(output) {
-        this.outputElement.innerHTML += output;
-        this.outputElement.scrollTop = this.outputElement.scrollHeight;
-    };
-
-    REPL.prototype.writeOutput = function(output) {
-        this.writeRawOutput(escapeHTML(output));
-    };
-
-    REPL.prototype.sendInput = function(line) {
-        var self = this;
-        apiCall("eval", { "index": this.index, source: line }, function(response) {
-            if(response.error) {
-                self.writeOutput(response.error + "\n");
-            }
-            self.writeOutput(self._prompt + " ");
-            self.writeRawOutput(response.highlighted_input + "\n");
-            self.writeOutput(response.result);
-            self.setPrompt(response.prompt);
-            self.setInput(response.prefilled_input);
-        });
-    };
-
-    REPL.prototype.onEnterKey = function() {
-        var text = this.getInput();
-        if(text != "" && text !== undefined) {
-            var previousCommands = JSON.parse(localStorage.getItem("better_errors_previous_commands"));
-            this.previousCommandOffset = previousCommands.push(text);
-            if(previousCommands.length > 100) {
-              previousCommands.splice(0, 1);
-            }
-            localStorage.setItem("better_errors_previous_commands", JSON.stringify(previousCommands));
-        }
-        this.setInput("");
-        this.sendInput(text);
-    };
-
-    REPL.prototype.onNavigateHistory = function(direction) {
-        this.previousCommandOffset += direction;
-        var previousCommands = JSON.parse(localStorage.getItem("better_errors_previous_commands"));
-
-        if(this.previousCommandOffset < 0) {
-            this.previousCommandOffset = -1;
-            this.setInput("");
-            return;
-        }
-
-        if(this.previousCommandOffset >= previousCommands.length) {
-            this.previousCommandOffset = previousCommands.length;
-            this.setInput("");
-            return;
-        }
-
-        this.setInput(previousCommands[this.previousCommandOffset]);
-    };
-
-    REPL.prototype.onKeyDown = function(ev) {
-        if(ev.keyCode == 13) {
-            this.onEnterKey();
-        } else if(ev.keyCode == 38 || (ev.ctrlKey && ev.keyCode == 80)) {
-            // the user pressed the up arrow or Ctrl-P
-            this.onNavigateHistory(-1);
-            ev.preventDefault();
-            return false;
-        } else if(ev.keyCode == 40 || (ev.ctrlKey && ev.keyCode == 78)) {
-            // the user pressed the down arrow or Ctrl-N
-            this.onNavigateHistory(1);
-            ev.preventDefault();
-            return false;
-        }
-    };
-
-    function switchTo(el) {
-        if(previousFrameInfo) previousFrameInfo.style.display = "none";
-        previousFrameInfo = el;
-
-        el.style.display = "block";
-
-        var replInput = el.querySelector('.console input');
-        if (replInput) replInput.focus();
-    }
-
-    function selectFrameInfo(index) {
-        var el = allFrameInfos[index];
-        if(el) {
-            if (el.loaded) {
-                return switchTo(el);
-            }
-
-            apiCall("variables", { "index": index }, function(response) {
-                el.loaded = true;
-                if(response.error) {
-                    el.innerHTML = "<span class='error'>" + escapeHTML(response.error) + "</span>";
-                } else {
-                    el.innerHTML = response.html;
-
-                    var repl = el.querySelector(".repl .console");
-                    if(repl) {
-                        new REPL(index).install(repl);
-                    }
-
-                    switchTo(el);
-                }
-            });
-        }
-    }
-
-    for(var i = 0; i < allFrames.length; i++) {
-        (function(i, el) {
-            var el = allFrames[i];
-            el.onclick = function() {
-                if(previousFrame) {
-                    previousFrame.className = "";
-                }
-                el.className = "selected";
-                previousFrame = el;
-
-                selectFrameInfo(el.attributes["data-index"].value);
-            };
-        })(i);
-    }
-
-    // Click the first application frame
-    (
-      document.querySelector(".frames li.application") ||
-      document.querySelector(".frames li")
-    ).onclick();
-
-    // This is the second query performed for frames; maybe the 'allFrames' list
-    // currently used and this list can be better used to avoid the repetition:
-    var applicationFramesCount = document.querySelectorAll(
-        "ul.frames li[data-context=application]"
-    ).length;
-
-    var applicationFramesButtonIsInstalled = false;
-    var applicationFramesButton = document.getElementById("application_frames");
-    var allFramesButton = document.getElementById("all_frames");
-
-    // The application frames button only needs to be bound if
-    // there are actually any application frames to look at.
-    var installApplicationFramesButton = function() {
-        applicationFramesButton.onclick = function() {
-            allFramesButton.className = "";
-            applicationFramesButton.className = "selected";
-            for(var i = 0; i < allFrames.length; i++) {
-                if(allFrames[i].attributes["data-context"].value == "application") {
-                    allFrames[i].style.display = "block";
-                } else {
-                    allFrames[i].style.display = "none";
-                }
-            }
-            return false;
-        };
-
-        applicationFramesButtonIsInstalled = true;
-    }
-
-    allFramesButton.onclick = function() {
-        if(applicationFramesButtonIsInstalled) {
-            applicationFramesButton.className = "";
-        }
-
-        allFramesButton.className = "selected";
-        for(var i = 0; i < allFrames.length; i++) {
-            allFrames[i].style.display = "block";
-        }
-        return false;
-    };
-
-    // If there are no application frames, select the 'All Frames'
-    // tab by default.
-    if(applicationFramesCount > 0) {
-        installApplicationFramesButton();
-        applicationFramesButton.onclick();
-    } else {
-        applicationFramesButton.className = "disabled";
-        applicationFramesButton.title = "No application frames available";
-        allFramesButton.onclick();
-    }
-})();
-</script>
-</html>
-
-<!-- generated by Better Errors in <%= Time.now.to_f - @start_time %> seconds -->
diff --git a/lib/better_errors/lib/better_errors/templates/text.erb b/lib/better_errors/lib/better_errors/templates/text.erb
deleted file mode 100644
index fe9068bbb..000000000
--- a/lib/better_errors/lib/better_errors/templates/text.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<%== text_heading("=", "%s at %s" % [exception.type, request_path]) %>
-
-> <%== exception.message %>
-<% if backtrace_frames.any? %>
-
-<%== text_heading("-", "%s, line %i" % [first_frame.pretty_path, first_frame.line]) %>
-
-``` ruby
-<%== text_formatted_code_block(first_frame) %>```
-
-App backtrace
--------------
-
-<%== application_frames.map { |s| " - #{s}" }.join("\n") %>
-
-Full backtrace
---------------
-
-<%== backtrace_frames.map { |s| " - #{s}" }.join("\n") %>
-
-<% end %>
diff --git a/lib/better_errors/lib/better_errors/templates/variable_info.erb b/lib/better_errors/lib/better_errors/templates/variable_info.erb
deleted file mode 100644
index bde5daab8..000000000
--- a/lib/better_errors/lib/better_errors/templates/variable_info.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-<header class="trace_info clearfix">
-    <div class="title">
-        <h2 class="name"><%= @frame.name %></h2>
-        <div class="location"><span class="filename"><a href="<%= editor_url(@frame) %>"><%= @frame.pretty_path %></a></span></div>
-    </div>
-    <div class="code_block clearfix">
-        <%== html_formatted_code_block @frame %>
-    </div>
-
-    <% if BetterErrors.binding_of_caller_available? && @frame.frame_binding %>
-        <div class="repl">
-            <div class="console">
-                <pre></pre>
-                <div class="prompt"><span>&gt;&gt;</span> <input/></div>
-            </div>
-        </div>
-    <% end %>
-</header>
-
-<% if BetterErrors.binding_of_caller_available? && @frame.frame_binding %>
-    <div class="hint">
-        This is a live shell. Type in here.
-    </div>
-
-    <div class="variable_info"></div>
-<% end %>
-
-<% unless BetterErrors.binding_of_caller_available? %>
-    <div class="hint">
-        <strong>Tip:</strong> add <code>gem "binding_of_caller"</code> to your Gemfile to enable the REPL and local/instance variable inspection.
-    </div>
-<% end %>
-
-<div class="sub">
-    <h3>Request info</h3>
-    <div class='inset variables'>
-        <table class="var_table">
-            <% if rails_params %>
-                <tr><td class="name">Request parameters</td><td><pre><%== inspect_value rails_params %></pre></td></tr>
-            <% end %>
-            <% if rack_session %>
-                <tr><td class="name">Rack session</td><td><pre><%== inspect_value rack_session %></pre></td></tr>
-            <% end %>
-        </table>
-    </div>
-</div>
-
-<div class="sub">
-    <h3>Local Variables</h3>
-    <div class='inset variables'>
-        <table class="var_table">
-            <% @frame.local_variables.each do |name, value| %>
-                <tr><td class="name"><%= name %></td><td><pre><%== inspect_value value %></pre></td></tr>
-            <% end %>
-        </table>
-    </div>
-</div>
-
-<div class="sub">
-    <h3>Instance Variables</h3>
-    <div class="inset variables">
-        <table class="var_table">
-            <% @frame.instance_variables.each do |name, value| %>
-                <tr><td class="name"><%= name %></td><td><pre><%== inspect_value value %></pre></td></tr>
-            <% end %>
-        </table>
-    </div>
-</div>
-
-<!-- <%= Time.now.to_f - @var_start_time %> seconds -->
diff --git a/lib/better_errors/lib/better_errors/version.rb b/lib/better_errors/lib/better_errors/version.rb
deleted file mode 100644
index 81769ce8b..000000000
--- a/lib/better_errors/lib/better_errors/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module BetterErrors
-  VERSION = "1.1.0"
-end
diff --git a/lib/better_errors/spec/better_errors/code_formatter_spec.rb b/lib/better_errors/spec/better_errors/code_formatter_spec.rb
deleted file mode 100644
index c084e2f91..000000000
--- a/lib/better_errors/spec/better_errors/code_formatter_spec.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-require "spec_helper"
-
-module BetterErrors
-  describe CodeFormatter do
-    let(:filename) { File.expand_path("../support/my_source.rb", __FILE__) }
-    
-    let(:formatter) { CodeFormatter.new(filename, 8) }
-    
-    it "picks an appropriate scanner" do
-      formatter.coderay_scanner.should == :ruby
-    end
-    
-    it "shows 5 lines of context" do
-      formatter.line_range.should == (3..13)
-      
-      formatter.context_lines.should == [
-          "three\n",
-          "four\n",
-          "five\n",
-          "six\n",
-          "seven\n",
-          "eight\n",
-          "nine\n",
-          "ten\n",
-          "eleven\n",
-          "twelve\n",
-          "thirteen\n"
-        ]
-    end
-
-    it "works when the line is right on the edge" do
-      formatter = CodeFormatter.new(filename, 20)
-      formatter.line_range.should == (15..20)
-    end
-
-    describe CodeFormatter::HTML do
-      it "highlights the erroring line" do
-        formatter = CodeFormatter::HTML.new(filename, 8)
-        formatter.output.should =~ /highlight.*eight/
-      end
-
-      it "works when the line is right on the edge" do
-        formatter = CodeFormatter::HTML.new(filename, 20)
-        formatter.output.should_not == formatter.source_unavailable
-      end
-      
-      it "doesn't barf when the lines don't make any sense" do
-        formatter = CodeFormatter::HTML.new(filename, 999)
-        formatter.output.should == formatter.source_unavailable
-      end
-      
-      it "doesn't barf when the file doesn't exist" do
-        formatter = CodeFormatter::HTML.new("fkdguhskd7e l", 1)
-        formatter.output.should == formatter.source_unavailable
-      end
-    end
-
-    describe CodeFormatter::Text do
-      it "highlights the erroring line" do
-        formatter = CodeFormatter::Text.new(filename, 8)
-        formatter.output.should == <<-TEXT.gsub(/^        /, "")
-            3   three
-            4   four
-            5   five
-            6   six
-            7   seven
-        >   8   eight
-            9   nine
-           10   ten
-           11   eleven
-           12   twelve
-           13   thirteen
-        TEXT
-      end
-
-      it "works when the line is right on the edge" do
-        formatter = CodeFormatter::Text.new(filename, 20)
-        formatter.output.should_not == formatter.source_unavailable
-      end
-
-      it "doesn't barf when the lines don't make any sense" do
-        formatter = CodeFormatter::Text.new(filename, 999)
-        formatter.output.should == formatter.source_unavailable
-      end
-      
-      it "doesn't barf when the file doesn't exist" do
-        formatter = CodeFormatter::Text.new("fkdguhskd7e l", 1)
-        formatter.output.should == formatter.source_unavailable
-      end
-    end
-  end
-end
diff --git a/lib/better_errors/spec/better_errors/error_page_spec.rb b/lib/better_errors/spec/better_errors/error_page_spec.rb
deleted file mode 100644
index daea57be6..000000000
--- a/lib/better_errors/spec/better_errors/error_page_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-require "spec_helper"
-
-module BetterErrors
-  describe ErrorPage do
-    let!(:exception) { raise ZeroDivisionError, "you divided by zero you silly goose!" rescue $! }
-  
-    let(:error_page) { ErrorPage.new exception, { "PATH_INFO" => "/some/path" } }
-    
-    let(:response) { error_page.render }
-    
-    let(:empty_binding) {
-      local_a = :value_for_local_a
-      local_b = :value_for_local_b
-      
-      @inst_c = :value_for_inst_c
-      @inst_d = :value_for_inst_d
-      
-      binding
-    }
-  
-    it "includes the error message" do
-      response.should include("you divided by zero you silly goose!")
-    end
-  
-    it "includes the request path" do
-      response.should include("/some/path")
-    end
-  
-    it "includes the exception class" do
-      response.should include("ZeroDivisionError")
-    end
-    
-    context "variable inspection" do
-      let(:exception) { empty_binding.eval("raise") rescue $! }
-      
-      if BetterErrors.binding_of_caller_available?
-        it "shows local variables" do
-          html = error_page.do_variables("index" => 0)[:html]
-          html.should include("local_a")
-          html.should include(":value_for_local_a")
-          html.should include("local_b")
-          html.should include(":value_for_local_b")
-        end
-      else
-        it "tells the user to add binding_of_caller to their gemfile to get fancy features" do
-          html = error_page.do_variables("index" => 0)[:html]
-          html.should include(%{gem "binding_of_caller"})
-        end
-      end
-      
-      it "shows instance variables" do
-        html = error_page.do_variables("index" => 0)[:html]
-        html.should include("inst_c")
-        html.should include(":value_for_inst_c")
-        html.should include("inst_d")
-        html.should include(":value_for_inst_d")
-      end
-
-      it "shows filter instance variables" do
-        BetterErrors.stub(:ignored_instance_variables).and_return([ :@inst_d ])
-        html = error_page.do_variables("index" => 0)[:html]
-        html.should include("inst_c")
-        html.should include(":value_for_inst_c")
-        html.should_not include('<td class="name">@inst_d</td>')
-        html.should_not include("<pre>:value_for_inst_d</pre>")
-      end
-    end
-    
-    it "doesn't die if the source file is not a real filename" do
-      exception.stub(:backtrace).and_return([
-        "<internal:prelude>:10:in `spawn_rack_application'"
-      ])
-      response.should include("Source unavailable")
-    end
-  end
-end
diff --git a/lib/better_errors/spec/better_errors/middleware_spec.rb b/lib/better_errors/spec/better_errors/middleware_spec.rb
deleted file mode 100644
index 2c638bfab..000000000
--- a/lib/better_errors/spec/better_errors/middleware_spec.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-require "spec_helper"
-
-module BetterErrors
-  describe Middleware do
-    let(:app) { Middleware.new(->env { ":)" }) }
-    let(:exception) { RuntimeError.new("oh no :(") }
-
-    it "passes non-error responses through" do
-      app.call({}).should == ":)"
-    end
-
-    it "calls the internal methods" do
-      app.should_receive :internal_call
-      app.call("PATH_INFO" => "/__better_errors/1/preform_awesomness")
-    end
-
-    it "calls the internal methods on any subfolder path" do
-      app.should_receive :internal_call
-      app.call("PATH_INFO" => "/any_sub/folder/path/__better_errors/1/preform_awesomness")
-    end
-
-    it "shows the error page" do
-      app.should_receive :show_error_page
-      app.call("PATH_INFO" => "/__better_errors/")
-    end
-
-    it "shows the error page on any subfolder path" do
-      app.should_receive :show_error_page
-      app.call("PATH_INFO" => "/any_sub/folder/path/__better_errors/")
-    end
-
-    it "doesn't show the error page to a non-local address" do
-      app.should_not_receive :better_errors_call
-      app.call("REMOTE_ADDR" => "1.2.3.4")
-    end
-
-    it "shows to a whitelisted IP" do
-      BetterErrors::Middleware.allow_ip! '77.55.33.11'
-      app.should_receive :better_errors_call
-      app.call("REMOTE_ADDR" => "77.55.33.11")
-    end
-
-    it "doesn't blow up when given a blank REMOTE_ADDR" do
-      expect { app.call("REMOTE_ADDR" => " ") }.to_not raise_error
-    end
-
-    it "doesn't blow up when given an IP address with a zone index" do
-      expect { app.call("REMOTE_ADDR" => "0:0:0:0:0:0:0:1%0" ) }.to_not raise_error
-    end
-
-    context "when requesting the /__better_errors manually" do
-      let(:app) { Middleware.new(->env { ":)" }) }
-
-      it "shows that no errors have been recorded" do
-        status, headers, body = app.call("PATH_INFO" => "/__better_errors")
-        body.join.should match /No errors have been recorded yet./
-      end
-
-      it "shows that no errors have been recorded on any subfolder path" do
-        status, headers, body = app.call("PATH_INFO" => "/any_sub/folder/path/__better_errors")
-        body.join.should match /No errors have been recorded yet./
-      end
-    end
-
-    context "when handling an error" do
-      let(:app) { Middleware.new(->env { raise exception }) }
-
-      it "returns status 500" do
-        status, headers, body = app.call({})
-
-        status.should == 500
-      end
-
-      context "original_exception" do
-        class OriginalExceptionException < Exception
-          attr_reader :original_exception
-
-          def initialize(message, original_exception = nil)
-            super(message)
-            @original_exception = original_exception
-          end
-        end
-
-        it "shows Original Exception if it responds_to and has an original_exception" do
-          app = Middleware.new(->env {
-            raise OriginalExceptionException.new("Other Exception", Exception.new("Original Exception"))
-          })
-
-          status, _, body = app.call({})
-
-          status.should == 500
-          body.join.should_not match(/Other Exception/)
-          body.join.should match(/Original Exception/)
-        end
-
-        it "won't crash if the exception responds_to but doesn't have an original_exception" do
-          app = Middleware.new(->env {
-            raise OriginalExceptionException.new("Other Exception")
-          })
-
-          status, _, body = app.call({})
-
-          status.should == 500
-          body.join.should match(/Other Exception/)
-        end
-      end
-
-      it "returns ExceptionWrapper's status_code" do
-        ad_ew = double("ActionDispatch::ExceptionWrapper")
-        ad_ew.stub('new').with({}, exception ){ double("ExceptionWrapper", status_code: 404) }
-        stub_const('ActionDispatch::ExceptionWrapper', ad_ew)
-
-        status, headers, body = app.call({})
-
-        status.should == 404
-      end
-
-      it "returns UTF-8 error pages" do
-        status, headers, body = app.call({})
-
-        headers["Content-Type"].should match /charset=utf-8/
-      end
-
-      it "returns text pages by default" do
-        status, headers, body = app.call({})
-
-        headers["Content-Type"].should match /text\/plain/
-      end
-
-      it "returns HTML pages by default" do
-        # Chrome's 'Accept' header looks similar this.
-        status, headers, body = app.call("HTTP_ACCEPT" => "text/html,application/xhtml+xml;q=0.9,*/*")
-
-        headers["Content-Type"].should match /text\/html/
-      end
-
-      it "logs the exception" do
-        logger = Object.new
-        logger.should_receive :fatal
-        BetterErrors.stub(:logger).and_return(logger)
-
-        app.call({})
-      end
-    end
-  end
-end
diff --git a/lib/better_errors/spec/better_errors/raised_exception_spec.rb b/lib/better_errors/spec/better_errors/raised_exception_spec.rb
deleted file mode 100644
index 605ab409c..000000000
--- a/lib/better_errors/spec/better_errors/raised_exception_spec.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require "spec_helper"
-
-module BetterErrors
-  describe RaisedException do
-    let(:exception) { RuntimeError.new("whoops") }
-    subject { RaisedException.new(exception) }
-
-    its(:exception) { should == exception }
-    its(:message)   { should == "whoops" }
-    its(:type)      { should == RuntimeError }
-
-    context "when the exception wraps another exception" do
-      let(:original_exception) { RuntimeError.new("something went wrong!") }
-      let(:exception) { double(:original_exception => original_exception) }
-
-      its(:exception) { should == original_exception }
-      its(:message)   { should == "something went wrong!" }
-    end
-
-    context "when the exception is a syntax error" do
-      let(:exception) { SyntaxError.new("foo.rb:123: you made a typo!") }
-
-      its(:message) { should == "you made a typo!" }
-      its(:type)    { should == SyntaxError }
-
-      it "has the right filename and line number in the backtrace" do
-        subject.backtrace.first.filename.should == "foo.rb"
-        subject.backtrace.first.line.should == 123
-      end
-    end
-
-    context "when the exception is a HAML syntax error" do
-      before do
-        stub_const("Haml::SyntaxError", Class.new(SyntaxError))
-      end
-
-      let(:exception) {
-        Haml::SyntaxError.new("you made a typo!").tap do |ex|
-          ex.set_backtrace(["foo.rb:123", "haml/internals/blah.rb:123456"])
-        end
-      }
-
-      its(:message) { should == "you made a typo!" }
-      its(:type)    { should == Haml::SyntaxError }
-
-      it "has the right filename and line number in the backtrace" do
-        subject.backtrace.first.filename.should == "foo.rb"
-        subject.backtrace.first.line.should == 123
-      end
-    end
-  end
-end
diff --git a/lib/better_errors/spec/better_errors/repl/basic_spec.rb b/lib/better_errors/spec/better_errors/repl/basic_spec.rb
deleted file mode 100644
index c533f632c..000000000
--- a/lib/better_errors/spec/better_errors/repl/basic_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require "spec_helper"
-require "better_errors/repl/basic"
-require "better_errors/repl/shared_examples"
-
-module BetterErrors
-  module REPL
-    describe Basic do
-      let(:fresh_binding) {
-        local_a = 123
-        binding
-      }
-      
-      let(:repl) { Basic.new fresh_binding }
-
-      it_behaves_like "a REPL provider"
-    end
-  end
-end
diff --git a/lib/better_errors/spec/better_errors/repl/pry_spec.rb b/lib/better_errors/spec/better_errors/repl/pry_spec.rb
deleted file mode 100644
index 1aa502c56..000000000
--- a/lib/better_errors/spec/better_errors/repl/pry_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require "spec_helper"
-require "pry"
-require "better_errors/repl/pry"
-require "better_errors/repl/shared_examples"
-
-module BetterErrors
-  module REPL
-    describe Pry do
-      let(:fresh_binding) {
-        local_a = 123
-        binding
-      }
-
-      let(:repl) { Pry.new fresh_binding }
-
-      it "does line continuation" do
-        output, prompt, filled = repl.send_input ""
-        output.should == "=> nil\n"
-        prompt.should == ">>"
-        filled.should == ""
-
-        output, prompt, filled = repl.send_input "def f(x)"
-        output.should == ""
-        prompt.should == ".."
-        filled.should == "  "
-
-        output, prompt, filled = repl.send_input "end"
-        if RUBY_VERSION >= "2.1.0"
-          output.should == "=> :f\n"
-        else
-          output.should == "=> nil\n"
-        end
-        prompt.should == ">>"
-        filled.should == ""
-      end
-
-      it_behaves_like "a REPL provider"
-    end
-  end
-end
diff --git a/lib/better_errors/spec/better_errors/repl/shared_examples.rb b/lib/better_errors/spec/better_errors/repl/shared_examples.rb
deleted file mode 100644
index 0154851db..000000000
--- a/lib/better_errors/spec/better_errors/repl/shared_examples.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-shared_examples_for "a REPL provider" do
-  it "evaluates ruby code in a given context" do
-    repl.send_input("local_a = 456")
-    fresh_binding.eval("local_a").should == 456
-  end
-  
-  it "returns a tuple of output and the new prompt" do
-    output, prompt = repl.send_input("1 + 2")
-    output.should == "=> 3\n"
-    prompt.should == ">>"
-  end
-  
-  it "doesn't barf if the code throws an exception" do
-    output, prompt = repl.send_input("raise Exception")
-    output.should include "Exception: Exception"
-    prompt.should == ">>"
-  end
-end
diff --git a/lib/better_errors/spec/better_errors/stack_frame_spec.rb b/lib/better_errors/spec/better_errors/stack_frame_spec.rb
deleted file mode 100644
index 420111eec..000000000
--- a/lib/better_errors/spec/better_errors/stack_frame_spec.rb
+++ /dev/null
@@ -1,157 +0,0 @@
-require "spec_helper"
-
-module BetterErrors
-  describe StackFrame do
-    context "#application?" do
-      it "is true for application filenames" do
-        BetterErrors.stub(:application_root).and_return("/abc/xyz")
-        frame = StackFrame.new("/abc/xyz/app/controllers/crap_controller.rb", 123, "index")
-
-        frame.application?.should be_true
-      end
-
-      it "is false for everything else" do
-        BetterErrors.stub(:application_root).and_return("/abc/xyz")
-        frame = StackFrame.new("/abc/nope", 123, "foo")
-
-        frame.application?.should be_false
-      end
-
-      it "doesn't care if no application_root is set" do
-        frame = StackFrame.new("/abc/xyz/app/controllers/crap_controller.rb", 123, "index")
-
-        frame.application?.should be_false
-      end
-    end
-
-    context "#gem?" do
-      it "is true for gem filenames" do
-        Gem.stub(:path).and_return(["/abc/xyz"])
-        frame = StackFrame.new("/abc/xyz/gems/whatever-1.2.3/lib/whatever.rb", 123, "foo")
-
-        frame.gem?.should be_true
-      end
-
-      it "is false for everything else" do
-        Gem.stub(:path).and_return(["/abc/xyz"])
-        frame = StackFrame.new("/abc/nope", 123, "foo")
-
-        frame.gem?.should be_false
-      end
-    end
-
-    context "#application_path" do
-      it "chops off the application root" do
-        BetterErrors.stub(:application_root).and_return("/abc/xyz")
-        frame = StackFrame.new("/abc/xyz/app/controllers/crap_controller.rb", 123, "index")
-
-        frame.application_path.should == "app/controllers/crap_controller.rb"
-      end
-    end
-
-    context "#gem_path" do
-      it "chops of the gem path and stick (gem) there" do
-        Gem.stub(:path).and_return(["/abc/xyz"])
-        frame = StackFrame.new("/abc/xyz/gems/whatever-1.2.3/lib/whatever.rb", 123, "foo")
-
-        frame.gem_path.should == "whatever (1.2.3) lib/whatever.rb"
-      end
-
-      it "prioritizes gem path over application path" do
-        BetterErrors.stub(:application_root).and_return("/abc/xyz")
-        Gem.stub(:path).and_return(["/abc/xyz/vendor"])
-        frame = StackFrame.new("/abc/xyz/vendor/gems/whatever-1.2.3/lib/whatever.rb", 123, "foo")
-
-        frame.gem_path.should == "whatever (1.2.3) lib/whatever.rb"
-      end
-    end
-
-    context "#pretty_path" do
-      it "returns #application_path for application paths" do
-        BetterErrors.stub(:application_root).and_return("/abc/xyz")
-        frame = StackFrame.new("/abc/xyz/app/controllers/crap_controller.rb", 123, "index")
-        frame.pretty_path.should == frame.application_path
-      end
-
-      it "returns #gem_path for gem paths" do
-        Gem.stub(:path).and_return(["/abc/xyz"])
-        frame = StackFrame.new("/abc/xyz/gems/whatever-1.2.3/lib/whatever.rb", 123, "foo")
-
-        frame.pretty_path.should == frame.gem_path
-      end
-    end
-
-    it "special cases SyntaxErrors" do
-      begin
-        eval(%{ raise SyntaxError, "you wrote bad ruby!" }, nil, "my_file.rb", 123)
-      rescue SyntaxError => syntax_error
-      end
-      frames = StackFrame.from_exception(syntax_error)
-      frames.first.filename.should == "my_file.rb"
-      frames.first.line.should == 123
-    end
-
-    it "doesn't blow up if no method name is given" do
-      error = StandardError.allocate
-
-      error.stub(:backtrace).and_return(["foo.rb:123"])
-      frames = StackFrame.from_exception(error)
-      frames.first.filename.should == "foo.rb"
-      frames.first.line.should == 123
-
-      error.stub(:backtrace).and_return(["foo.rb:123: this is an error message"])
-      frames = StackFrame.from_exception(error)
-      frames.first.filename.should == "foo.rb"
-      frames.first.line.should == 123
-    end
-
-    it "ignores a backtrace line if its format doesn't make any sense at all" do
-      error = StandardError.allocate
-      error.stub(:backtrace).and_return(["foo.rb:123:in `foo'", "C:in `find'", "bar.rb:123:in `bar'"])
-      frames = StackFrame.from_exception(error)
-      frames.count.should == 2
-    end
-
-    it "doesn't blow up if a filename contains a colon" do
-      error = StandardError.allocate
-      error.stub(:backtrace).and_return(["crap:filename.rb:123"])
-      frames = StackFrame.from_exception(error)
-      frames.first.filename.should == "crap:filename.rb"
-    end
-
-    it "doesn't blow up with a BasicObject as frame binding" do
-      obj = BasicObject.new
-      def obj.my_binding
-        ::Kernel.binding
-      end
-      frame = StackFrame.new("/abc/xyz/app/controllers/crap_controller.rb", 123, "index", obj.my_binding)
-      frame.class_name.should == 'BasicObject'
-    end
-
-    it "sets method names properly" do
-      obj = "string"
-      def obj.my_method
-        begin
-          raise "foo"
-        rescue => err
-          err
-        end
-      end
-
-      frame = StackFrame.from_exception(obj.my_method).first
-      if BetterErrors.binding_of_caller_available?
-        frame.method_name.should == "#my_method"
-        frame.class_name.should == "String"
-      else
-        frame.method_name.should == "my_method"
-        frame.class_name.should == nil
-      end
-    end
-
-    if RUBY_ENGINE == "java"
-      it "doesn't blow up on a native Java exception" do
-        expect { StackFrame.from_exception(java.lang.Exception.new) }.to_not raise_error
-      end
-    end
-  end
-end
diff --git a/lib/better_errors/spec/better_errors/support/my_source.rb b/lib/better_errors/spec/better_errors/support/my_source.rb
deleted file mode 100644
index 6dfea0f66..000000000
--- a/lib/better_errors/spec/better_errors/support/my_source.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-one
-two
-three
-four
-five
-six
-seven
-eight
-nine
-ten
-eleven
-twelve
-thirteen
-fourteen
-fifteen
-sixteen
-seventeen
-eighteen
-nineteen
-twenty
diff --git a/lib/better_errors/spec/better_errors_spec.rb b/lib/better_errors/spec/better_errors_spec.rb
deleted file mode 100644
index e9b26b67d..000000000
--- a/lib/better_errors/spec/better_errors_spec.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-require "spec_helper"
-
-describe BetterErrors do
-  context ".editor" do
-    it "defaults to textmate" do
-      subject.editor["foo.rb", 123].should == "txmt://open?url=file://foo.rb&line=123"
-    end
-
-    it "url escapes the filename" do
-      subject.editor["&.rb", 0].should == "txmt://open?url=file://%26.rb&line=0"
-    end
-
-    [:emacs, :emacsclient].each do |editor|
-      it "uses emacs:// scheme when set to #{editor.inspect}" do
-        subject.editor = editor
-        subject.editor[].should start_with "emacs://"
-      end
-    end
-
-    [:macvim, :mvim].each do |editor|
-      it "uses mvim:// scheme when set to #{editor.inspect}" do
-        subject.editor = editor
-        subject.editor[].should start_with "mvim://"
-      end
-    end
-
-    [:sublime, :subl, :st].each do |editor|
-      it "uses subl:// scheme when set to #{editor.inspect}" do
-        subject.editor = editor
-        subject.editor[].should start_with "subl://"
-      end
-    end
-
-    [:textmate, :txmt, :tm].each do |editor|
-      it "uses txmt:// scheme when set to #{editor.inspect}" do
-        subject.editor = editor
-        subject.editor[].should start_with "txmt://"
-      end
-    end
-
-    ["emacsclient", "/usr/local/bin/emacsclient"].each do |editor|
-      it "uses emacs:// scheme when EDITOR=#{editor}" do
-        ENV["EDITOR"] = editor
-        subject.editor = subject.default_editor
-        subject.editor[].should start_with "emacs://"
-      end
-    end
-
-    ["mvim -f", "/usr/local/bin/mvim -f"].each do |editor|
-      it "uses mvim:// scheme when EDITOR=#{editor}" do
-        ENV["EDITOR"] = editor
-        subject.editor = subject.default_editor
-        subject.editor[].should start_with "mvim://"
-      end
-    end
-
-    ["subl -w", "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"].each do |editor|
-      it "uses mvim:// scheme when EDITOR=#{editor}" do
-        ENV["EDITOR"] = editor
-        subject.editor = subject.default_editor
-        subject.editor[].should start_with "subl://"
-      end
-    end
-
-    ["mate -w", "/usr/bin/mate -w"].each do |editor|
-      it "uses txmt:// scheme when EDITOR=#{editor}" do
-        ENV["EDITOR"] = editor
-        subject.editor = subject.default_editor
-        subject.editor[].should start_with "txmt://"
-      end
-    end
-  end
-end
diff --git a/lib/better_errors/spec/spec_helper.rb b/lib/better_errors/spec/spec_helper.rb
deleted file mode 100644
index 40d63261e..000000000
--- a/lib/better_errors/spec/spec_helper.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-$: << File.expand_path("../../lib", __FILE__)
-
-ENV["EDITOR"] = nil
-
-require "better_errors"
diff --git a/lib/better_errors/spec/without_binding_of_caller.rb b/lib/better_errors/spec/without_binding_of_caller.rb
deleted file mode 100644
index 035e2e90f..000000000
--- a/lib/better_errors/spec/without_binding_of_caller.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Kernel
-  alias_method :require_with_binding_of_caller, :require
-
-  def require(feature)
-    raise LoadError if feature == "binding_of_caller"
-
-    require_with_binding_of_caller(feature)
-  end
-end
diff --git a/lib/git_refresh_changes.py b/lib/git_refresh_changes.py
new file mode 100644
index 000000000..a0250243e
--- /dev/null
+++ b/lib/git_refresh_changes.py
@@ -0,0 +1,30 @@
+#coding=utf-8
+#!/usr/bin/env python
+
+# 脚本用于刷新版本库，由git hooks里进行调用，传入参数为git仓库路径
+# 需要配置rails项目地址
+# 必须装此文件放在git的存放目录，现在是  /home/pdl/redmine-2.3.2-0/apache2/htdocs
+
+import sys
+import os
+import urllib
+import urllib2
+
+RAILS_URL = 'http://192.168.128.128:3000/'
+
+def get_git_path():  
+    return sys.argv[1]
+    path=os.path.realpath(sys.argv[0]) 
+    if os.path.isfile(path):  
+        path=os.path.dirname(os.path.dirname(path))  
+    return os.path.abspath(path) 
+
+def post_http_data(url, data):
+	data_urlencode = urllib.urlencode(data)
+	req = urllib2.Request(url = url,data =data_urlencode)
+	res_data = urllib2.urlopen(req)
+	#res = res_data.read()
+	#return res
+
+path = get_git_path()
+post_http_data(RAILS_URL + 'git_callback/post_update', {'root_url': path})
diff --git a/lib/rack-mini-profiler/.travis.yml b/lib/rack-mini-profiler/.travis.yml
deleted file mode 100644
index 61ab0d68e..000000000
--- a/lib/rack-mini-profiler/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-bundler_args: ""
-services:
-  - redis
-  - memcached
diff --git a/lib/rack-mini-profiler/CHANGELOG b/lib/rack-mini-profiler/CHANGELOG
deleted file mode 100644
index 7c08a89e1..000000000
--- a/lib/rack-mini-profiler/CHANGELOG
+++ /dev/null
@@ -1,181 +0,0 @@
-28-June-2012 - Sam
-
-  * Started change log
-  * Corrected profiler so it properly captures POST requests (was supressing non 200s)
-  * Amended Rack.MiniProfiler.config[:user_provider] to use ip addres for identity
-  * Fixed bug where unviewed missing ids never got cleared
-  * Supress all '/assets/' in the rails tie (makes debugging easier)
-  * record_sql was mega buggy
-  * added MemcacheStore
-
-9-July-2012 - Sam
-
-  * Cleaned up mechanism for profiling in production, all you need to do now
-  is call Rack::MiniProfiler.authorize_request to get profiling working in
-  production
-  * Added option to display full backtraces pp=full-backtrace
-  * Cleaned up railties, got rid of the post authorize callback
-  * Version 0.1.3
-
-12-July-2012 - Sam
-
-  * Fixed incorrect profiling steps (was not indenting or measuring start time right
-  * Implemented native PG and MySql2 interceptors, this gives way more accurate times
-  * Refactored context so its a proper class and not a hash
-  * Added some more client probing built in to rails
-  * More tests
-
-18-July-2012 - Sam
-
-  * Added First Paint time for chrome
-  * Bug fix to ensure non Rails installs have mini profiler
-  * Version 0.1.7
-
-30-July-2012 - Sam
-
-  * Made compliant with ancient versions of Rack (including Rack used by Rails2)
-  * Fixed broken share link
-  * Fixed crashes on startup (in MemoryStore and FileStore)
-  * Version 0.1.8
-  * Unicode fix
-  * Version 0.1.9
-
-7-August-2012 - Sam
-
-  * Added option to disable profiler for the current session (pp=disable / pp=enable)
-  * yajl compatability contributed by Sven Riedel
-
-10-August-2012 - Sam
-
-  * Added basic prepared statement profiling for postgres
-
-20-August-2012 - Sam
-
-  * 1.12.pre
-  * Cap X-MiniProfiler-Ids at 10, otherwise the header can get killed
-
-3-September-2012 - Sam
-
-  * 1.13.pre
-  * pg gem prepared statements were not being logged correctly
-  * added setting config.backtrace_ignores = [] - an array of regexes that match on caller lines that get ignored
-  * added setting config.backtrace_includes = [] - an array of regexes that get included in the trace by default
-  * cleaned up the way client settings are stored
-  * made pp=full-backtrace "sticky"
-  * added pp=normal-backtrace to clear the "sticky" state
-  * change "pp=sample" to work with "caller" no need for stack trace gem
-
-4-September-2012 - Sam
-
-  * 1.15.pre
-  * fixed annoying bug where client settings were not sticking
-  * fixed long standing issue with Rack::ConditionalGet stopping MiniProfiler from working properly
-
-5-September-2012 - Sam
-
-  * 1.16
-  * fixed long standing problem specs (issue with memory store)
-  * fixed issue where profiler would be dumped when you got a 404 in production (and any time rails is bypassed)
-  * implemented stacktrace properly
-
-9-September-2012 - Sam
-
-  * 1.17
-  * pp=sample was bust unless stacktrace was installed
-
-10-September-2012 - Sam
-
-  * 1.19
-  * fix compat issue with 1.8.7
-
-12-September-2012 - Sam
-
-  * 1.20
-  * Added pp=profile-gc , it allows you to profile the GC in Ruby 1.9.3
-
-17-September-2012
-  * 1.21
-  * New MemchacedStore
-  * Rails 4 support
-
-17-September-2012
-  * Allow rack-mini-profiler to be sourced from github
-  * Extracted the pp=profile-gc-time out, the object space profiler needs to disable gc
-
-20-September-2012
-  * 1.22
-  * Fix permission issue in the gem
-
-8-April-2013
-  * 1.24
-  * Flame Graph Support see: http://samsaffron.com/archive/2013/03/19/flame-graphs-in-ruby-miniprofiler
-  * Fix file retention leak in file_store
-  * New toggle_shortcut and start_hidden options
-  * Fix for AngularJS support and MooTools
-  * More robust gc profiling
-  * Mongoid support
-  * Fix for html5 implicit body tags
-  * script tag initialized via data-attributes
-  * new - Rack::MiniProfiler.counter counter_name {}
-  * Allow usage of existing jQuery if its already loaded
-  * Fix pp=enable
-  * 1.8.7 support ... grrr
-  * Net:HTTP profiling
-  * pre authorize to run in all non development? and production? modes
-
-8-April-2013
-  * 1.25
-  * Missed flamegraph.html from build
-
-11-April-2013
-  * 1.26
-  * (minor) allow Rack::MiniProfilerRails.initialize!(Rails.application), for post config intialization
-
-26-June-2013
-  * 1.27
-  * Disable global ajax handlers on MP requests @JP
-  * Add Rack::MiniProfiler.config.backtrace_threshold_ms
-  * jQuery 2.0 support
-
-18-July-2013
-  * 1.28
-	* diagnostics in abstract storage was raising not implemented killing
-	?pp=env and others
-  * SOLR xml unescaped by mistake
-
-20-August-2013
-  * 1.29
-  * Bugfix: SOLR patching had an incorrect monkey patch
-  * Implemented exception tracing using TracePoint see pp=trace-exceptions
-
-30-August-2013
-
-  * 1.30
-  * Feature: Added Rack::MiniProfiler.counter_method(klass,name) for injecting counters
-  * Bug: Counters were not shifting the table correctly
-
-3-September-2013
-
-  * Ripped out flamegraph so it can be isolated into a gem
-  * Flamegraph now has much increased fidelity
-  * Ripped out pp=sample it just was never really used
-
-17-September-2013 - Ross Wilson
-  * Instead of supressing all "/assets/" requests we now check the configured
-  config.assets.prefix path since developers can rename the path to serve Asset Pipeline
-  files from
-
-12-December-2013 - Sam Saffron
-  * Version 0.9.0.pre (bumped up to reflect the stability of the project)
-  * Improved reports for pp=profile-gc
-  * pp=flamegraph&flamegraph_sample_rate=1 , allow you to specify sampling rates
-
-13-March-2014 - Sam Saffron
-  * Version 0.9.1
-  * Added back Ruby 1.8 support (thanks Malet)
-  * Corrected Rails 3.0 support (thanks Zlatko)
-  * Corrected fix possible XSS (admin only)
-  * Amend Railstie so MiniProfiler can be launched with action view or action controller (Thanks Akira)
-  * Corrected Sql patching to avoid setting instance vars on nil which is frozen (thanks Andy, huoxito)
-
-
diff --git a/lib/rack-mini-profiler/Gemfile b/lib/rack-mini-profiler/Gemfile
deleted file mode 100644
index d65e2a669..000000000
--- a/lib/rack-mini-profiler/Gemfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec
diff --git a/lib/rack-mini-profiler/README.md b/lib/rack-mini-profiler/README.md
deleted file mode 100644
index 550dc1e07..000000000
--- a/lib/rack-mini-profiler/README.md
+++ /dev/null
@@ -1,271 +0,0 @@
-# rack-mini-profiler
-
-[![Code Climate](https://codeclimate.com/github/MiniProfiler/rack-mini-profiler.png)](https://codeclimate.com/github/MiniProfiler/rack-mini-profiler) [![Build Status](https://travis-ci.org/MiniProfiler/rack-mini-profiler.png)](https://travis-ci.org/MiniProfiler/rack-mini-profiler)
-
-Middleware that displays speed badge for every html page. Designed to work both in production and in development.
-
-#### Features
-
-* database profiling. Currently supports Mysql2, Postgres, and Mongoid3 (with fallback support to ActiveRecord)
-
-#### Learn more
-
-* [Visit our community](http://community.miniprofiler.com)
-* [Watch the RailsCast](http://railscasts.com/episodes/368-miniprofiler)
-* [Read about Flame graphs in rack-mini-profiler](http://samsaffron.com/archive/2013/03/19/flame-graphs-in-ruby-miniprofiler)
-* [Read the announcement posts from 2012](http://samsaffron.com/archive/2012/07/12/miniprofiler-ruby-edition)
-
-## rack-mini-profiler needs your help
-
-We have decided to restructure our repository so there is a central UI repo and the various language implementation have their own.
-
-**WE NEED HELP.**
-
-- Setting up a build that reuses https://github.com/MiniProfiler/ui
-- Migrating the internal data structures [per the spec](https://github.com/MiniProfiler/ui)
-- Cleaning up the [horrendous class structure that is using strings as keys and crazy non-objects](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/lib/mini_profiler/sql_timer_struct.rb#L36-L44)
-
-If you feel like taking on any of this start an issue and update us on your progress.
-
-## Installation
-
-Install/add to Gemfile
-
-```ruby
-gem 'rack-mini-profiler'
-```
-
-NOTE: Be sure to require rack_mini_profiler below the `pg` and `mysql` gems in your Gemfile. rack_mini_profiler will identify these gems if they are loaded to insert instrumentation. If included too early no SQL will show up.
-
-#### Rails
-
-All you have to do is include the Gem and you're good to go in development. See notes below for use in production.
-
-#### Rails and manual initialization
-
-In case you need to make sure rack_mini_profiler initialized after all other gems.
-Or you want to execute some code before rack_mini_profiler required.
-
-```ruby
-gem 'rack-mini-profiler', require: false
-```
-Note the `require: false` part - if omitted, it will cause the Railtie for the mino-profiler to
-be loaded outright, and an attempt to re-initialize it manually will raise an exception.
-
-Then put initialize code in file like `config/initializers/rack_profiler.rb`
-
-```ruby
-if Rails.env == 'development'
-  require 'rack-mini-profiler'
-
-  # initialization is skipped so trigger it
-  Rack::MiniProfilerRails.initialize!(Rails.application)
-end
-```
-
-#### Rack Builder
-
-```ruby
-require 'rack-mini-profiler'
-builder = Rack::Builder.new do
-  use Rack::MiniProfiler
-
-  map('/')    { run get }
-end
-```
-
-#### Sinatra
-
-```ruby
-require 'rack-mini-profiler'
-class MyApp < Sinatra::Base
-  use Rack::MiniProfiler
-end
-```
-
-### Flamegraphs
-
-To generate [flamegraphs](http://samsaffron.com/archive/2013/03/19/flame-graphs-in-ruby-miniprofiler):
-
-* add the **flamegraph** gem to your Gemfile
-* visit a page in your app with `?pp=flamegraph`
-
-Flamegraph generation is supported in MRI 2.0 and 2.1 only.
-
-
-## Access control in production
-
-rack-mini-profiler is designed with production profiling in mind. To enable that just run `Rack::MiniProfiler.authorize_request` once you know a request is allowed to profile.
-
-```ruby
-# A hook in your ApplicationController
-def authorize
-  if current_user.is_admin?
-    Rack::MiniProfiler.authorize_request
-  end
-end
-```
-
-## Configuration
-
-Various aspects of rack-mini-profiler's behavior can be configured when your app boots.
-For example in a Rails app, this should be done in an initializer:
-**config/initializers/mini_profiler.rb**
-
-### Storage
-
-rack-mini-profiler stores its results so they can be shared later and aren't lost at the end of the request.
-
-There are 4 storage options: `MemoryStore`, `RedisStore`, `MemcacheStore`, and `FileStore`.
-
-`FileStore` is the default in Rails environments and will write files to `tmp/miniprofiler/*`.  `MemoryStore` is the default otherwise.
-
-```ruby
-# set MemoryStore
-Rack::MiniProfiler.config.storage = Rack::MiniProfiler::MemoryStore
-
-# set RedisStore
-if Rails.env.production?
-  uri = URI.parse(ENV["REDIS_SERVER_URL"])
-  Rack::MiniProfiler.config.storage_options = { :host => uri.host, :port => uri.port, :password => uri.password }
-  Rack::MiniProfiler.config.storage = Rack::MiniProfiler::RedisStore
-end
-```
-
-MemoryStore stores results in a processes heap - something that does not work well in a multi process environment.
-FileStore stores results in the file system - something that may not work well in a multi machine environment.
-RedisStore/MemcacheStore work in multi process and multi machine environments (RedisStore only saves results for up to 24 hours so it won't continue to fill up Redis).
-
-Additionally you may implement an AbstractStore for your own provider.
-
-### User result segregation
-
-MiniProfiler will attempt to keep all user results isolated, out-of-the-box the user provider uses the ip address:
-
-```ruby
-Rack::MiniProfiler.config.user_provider = Proc.new{|env| Rack::Request.new(env).ip}
-```
-
-You can override (something that is very important in a multi-machine production setup):
-
-```ruby
-Rack::MiniProfiler.config.user_provider = Proc.new{ |env| CurrentUser.get(env) }
-```
-
-The string this function returns should be unique for each user on the system (for anonymous you may need to fall back to ip address)
-
-### Configuration Options
-
-You can set configuration options using the configuration accessor on `Rack::MiniProfiler`.
-For example:
-
-```ruby
-Rack::MiniProfiler.config.position = 'right'
-Rack::MiniProfiler.config.start_hidden = true
-```
-The available configuration options are:
-
-* pre_authorize_cb - A lambda callback you can set to determine whether or not mini_profiler should be visible on a given request. Default in a Rails environment is only on in development mode. If in a Rack app, the default is always on.
-* position - Can either be 'right' or 'left'. Default is 'left'.
-* skip_schema_queries - Whether or not you want to log the queries about the schema of your tables. Default is 'false', 'true' in rails development.
-* auto_inject (default true) - when false the miniprofiler script is not injected in the page
-* backtrace_filter - a regex you can use to filter out unwanted lines from the backtraces
-* toggle_shortcut (default Alt+P) - a jquery.hotkeys.js-style keyboard shortcut, used to toggle the mini_profiler's visibility. See http://code.google.com/p/js-hotkeys/ for more info.
-* start_hidden (default false) - Whether or not you want the mini_profiler to be visible when loading a page
-* backtrace_threshold_ms (default zero) - Minimum SQL query elapsed time before a backtrace is recorded. Backtrace recording can take a couple of milliseconds on rubies earlier than 2.0, impacting performance for very small queries.
-* flamegraph_sample_rate (default 0.5ms) - How often fast_stack should get stack trace info to generate flamegraphs
-
-### Custom middleware ordering (required if using `Rack::Deflate` with Rails)
-
-If you are using `Rack::Deflate` with rails and rack-mini-profiler in its default configuration,
-`Rack::MiniProfiler` will be injected (as always) at position 0 in the middleware stack. This
-will result in it attempting to inject html into the already-compressed response body. To fix this,
-the middleware ordering must be overriden.
-
-To do this, first add `, require: false` to the gemfile entry for rack-mini-profiler.
-This will prevent the railtie from running. Then, customize the initialization
-in the initializer like so:
-
-```ruby
-require 'rack-mini-profiler'
-
-Rack::MiniProfilerRails.initialize!(Rails.application)
-
-Rails.application.middleware.delete(Rack::MiniProfiler)
-Rails.application.middleware.insert_after(Rack::Deflater, Rack::MiniProfiler)
-```
-
-Deleting the middleware and then reinserting it is a bit inelegant, but
-a sufficient and costless solution. It is possible that rack-mini-profiler might
-support this scenario more directly if it is found that
-there is significant need for this confriguration or that
-the above recipe causes problems.
-
-
-## Special query strings
-
-If you include the query string `pp=help` at the end of your request you will see the various options available. You can use these options to extend or contract the amount of diagnostics rack-mini-profiler gathers.
-
-
-## Rails 2.X support
-
-To get MiniProfiler working with Rails 2.3.X you need to do the initialization manually as well as monkey patch away an incompatibility between activesupport and json_pure.
-
-Add the following code to your environment.rb (or just in a specific environment such as development.rb) for initialization and configuration of MiniProfiler.
-
-```ruby
-# configure and initialize MiniProfiler
-require 'rack-mini-profiler'
-c = ::Rack::MiniProfiler.config
-c.pre_authorize_cb = lambda { |env|
-  Rails.env.development? || Rails.env.production?
-}
-tmp = Rails.root.to_s + "/tmp/miniprofiler"
-FileUtils.mkdir_p(tmp) unless File.exists?(tmp)
-c.storage_options = {:path => tmp}
-c.storage = ::Rack::MiniProfiler::FileStore
-config.middleware.use(::Rack::MiniProfiler)
-::Rack::MiniProfiler.profile_method(ActionController::Base, :process) {|action| "Executing action: #{action}"}
-::Rack::MiniProfiler.profile_method(ActionView::Template, :render) {|x,y| "Rendering: #{path_without_format_and_extension}"}
-
-# monkey patch away an activesupport and json_pure incompatability
-# http://pivotallabs.com/users/alex/blog/articles/1332-monkey-patch-of-the-day-activesupport-vs-json-pure-vs-ruby-1-8
-if JSON.const_defined?(:Pure)
-  class JSON::Pure::Generator::State
-    include ActiveSupport::CoreExtensions::Hash::Except
-  end
-end
-```
-
-## Running the Specs
-
-```
-$ rake build
-$ rake spec
-```
-
-Additionally you can also run `autotest` if you like.
-
-## Licence
-
-The MIT License (MIT)
-
-Copyright (c) 2013 Sam Saffron
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/lib/rack-mini-profiler/Rakefile b/lib/rack-mini-profiler/Rakefile
deleted file mode 100644
index a908b5b62..000000000
--- a/lib/rack-mini-profiler/Rakefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# Rakefile
-require 'rubygems'
-require 'bundler'
-Bundler.setup(:default, :test)
-
-task :default => [:spec]
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-desc "builds a gem"
-task :build => :update_asset_version do
-  `gem build rack-mini-profiler.gemspec 1>&2`
-end
-
-desc "compile less"
-task :compile_less => :copy_files do
-  `lessc lib/html/includes.less > lib/html/includes.css`
-end
-
-desc "update asset version file"
-task :update_asset_version => :compile_less do
-  require 'digest/md5'
-  h = []
-  Dir.glob('lib/html/*.{js,html,css,tmpl}').each do |f|
-    h << Digest::MD5.hexdigest(::File.read(f))
-  end
-  File.open('lib/mini_profiler/version.rb','w') do |f|
-    f.write \
-"module Rack
-  class MiniProfiler
-    VERSION = '#{Digest::MD5.hexdigest(h.sort.join(''))}'.freeze
-  end
-end"
-  end
-end
-
-
-desc "copy files from other parts of the tree"
-task :copy_files do
-  # TODO grab files from MiniProfiler/UI
-end
-
diff --git a/lib/rack-mini-profiler/autotest/discover.rb b/lib/rack-mini-profiler/autotest/discover.rb
deleted file mode 100644
index de32a0121..000000000
--- a/lib/rack-mini-profiler/autotest/discover.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-Autotest.add_discovery { "rspec2" }
-
diff --git a/lib/rack-mini-profiler/lib/html/includes.css b/lib/rack-mini-profiler/lib/html/includes.css
deleted file mode 100644
index d96528b8d..000000000
--- a/lib/rack-mini-profiler/lib/html/includes.css
+++ /dev/null
@@ -1,451 +0,0 @@
-.profiler-result,
-.profiler-queries {
-  color: #555;
-  line-height: 1;
-  font-size: 12px;
-}
-.profiler-result pre,
-.profiler-queries pre,
-.profiler-result code,
-.profiler-queries code,
-.profiler-result label,
-.profiler-queries label,
-.profiler-result table,
-.profiler-queries table,
-.profiler-result tbody,
-.profiler-queries tbody,
-.profiler-result thead,
-.profiler-queries thead,
-.profiler-result tfoot,
-.profiler-queries tfoot,
-.profiler-result tr,
-.profiler-queries tr,
-.profiler-result th,
-.profiler-queries th,
-.profiler-result td,
-.profiler-queries td {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-size: 100%;
-  font: inherit;
-  vertical-align: baseline;
-  background-color: transparent;
-  overflow: visible;
-  max-height: none;
-}
-.profiler-result table,
-.profiler-queries table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-.profiler-result a,
-.profiler-queries a,
-.profiler-result a:hover,
-.profiler-queries a:hover {
-  cursor: pointer;
-  color: #0077cc;
-}
-.profiler-result a,
-.profiler-queries a {
-  text-decoration: none;
-}
-.profiler-result a:hover,
-.profiler-queries a:hover {
-  text-decoration: underline;
-}
-.profiler-result {
-  font-family: Helvetica, Arial, sans-serif;
-}
-.profiler-result .profiler-toggle-duration-with-children {
-  float: right;
-}
-.profiler-result table.profiler-client-timings {
-  margin-top: 10px;
-}
-.profiler-result .profiler-label {
-  color: #555555;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-.profiler-result .profiler-unit {
-  color: #aaaaaa;
-}
-.profiler-result .profiler-trivial {
-  display: none;
-}
-.profiler-result .profiler-trivial td,
-.profiler-result .profiler-trivial td * {
-  color: #aaaaaa !important;
-}
-.profiler-result pre,
-.profiler-result code,
-.profiler-result .profiler-number,
-.profiler-result .profiler-unit {
-  font-family: Consolas, monospace, serif;
-}
-.profiler-result .profiler-number {
-  color: #111111;
-}
-.profiler-result .profiler-info {
-  text-align: right;
-}
-.profiler-result .profiler-info .profiler-name {
-  float: left;
-}
-.profiler-result .profiler-info .profiler-server-time {
-  white-space: nowrap;
-}
-.profiler-result .profiler-timings th {
-  background-color: #fff;
-  color: #aaaaaa;
-  text-align: right;
-}
-.profiler-result .profiler-timings th,
-.profiler-result .profiler-timings td {
-  white-space: nowrap;
-}
-.profiler-result .profiler-timings .profiler-duration-with-children {
-  display: none;
-}
-.profiler-result .profiler-timings .profiler-duration {
-  font-family: Consolas, monospace, serif;
-  color: #111111;
-  text-align: right;
-}
-.profiler-result .profiler-timings .profiler-indent {
-  letter-spacing: 4px;
-}
-.profiler-result .profiler-timings .profiler-queries-show .profiler-number,
-.profiler-result .profiler-timings .profiler-queries-show .profiler-unit {
-  color: #0077cc;
-}
-.profiler-result .profiler-timings .profiler-queries-duration {
-  padding-left: 6px;
-}
-.profiler-result .profiler-timings .profiler-percent-in-sql {
-  white-space: nowrap;
-  text-align: right;
-}
-.profiler-result .profiler-timings tfoot td {
-  padding-top: 10px;
-  text-align: right;
-}
-.profiler-result .profiler-timings tfoot td a {
-  font-size: 95%;
-  display: inline-block;
-  margin-left: 12px;
-}
-.profiler-result .profiler-timings tfoot td a:first-child {
-  float: left;
-  margin-left: 0px;
-}
-.profiler-result .profiler-timings tfoot td a.profiler-custom-link {
-  float: left;
-}
-.profiler-result .profiler-queries {
-  font-family: Helvetica, Arial, sans-serif;
-}
-.profiler-result .profiler-queries .profiler-stack-trace {
-  margin-bottom: 15px;
-}
-.profiler-result .profiler-queries pre {
-  font-family: Consolas, monospace, serif;
-  white-space: pre-wrap;
-}
-.profiler-result .profiler-queries th {
-  background-color: #fff;
-  border-bottom: 1px solid #555;
-  font-weight: bold;
-  padding: 15px;
-  white-space: nowrap;
-}
-.profiler-result .profiler-queries td {
-  padding: 15px;
-  text-align: left;
-  background-color: #fff;
-}
-.profiler-result .profiler-queries td:last-child {
-  padding-right: 25px;
-}
-.profiler-result .profiler-queries .profiler-odd td {
-  background-color: #e5e5e5;
-}
-.profiler-result .profiler-queries .profiler-since-start,
-.profiler-result .profiler-queries .profiler-duration {
-  text-align: right;
-}
-.profiler-result .profiler-queries .profiler-info div {
-  text-align: right;
-  margin-bottom: 5px;
-}
-.profiler-result .profiler-queries .profiler-gap-info,
-.profiler-result .profiler-queries .profiler-gap-info td {
-  background-color: #ccc;
-}
-.profiler-result .profiler-queries .profiler-gap-info .profiler-unit {
-  color: #777;
-}
-.profiler-result .profiler-queries .profiler-gap-info .profiler-info {
-  text-align: right;
-}
-.profiler-result .profiler-queries .profiler-gap-info.profiler-trivial-gaps {
-  display: none;
-}
-.profiler-result .profiler-queries .profiler-trivial-gap-container {
-  text-align: center;
-}
-.profiler-result .profiler-queries .str {
-  color: #800000;
-}
-.profiler-result .profiler-queries .kwd {
-  color: #00008b;
-}
-.profiler-result .profiler-queries .com {
-  color: #808080;
-}
-.profiler-result .profiler-queries .typ {
-  color: #2b91af;
-}
-.profiler-result .profiler-queries .lit {
-  color: #800000;
-}
-.profiler-result .profiler-queries .pun {
-  color: #000000;
-}
-.profiler-result .profiler-queries .pln {
-  color: #000000;
-}
-.profiler-result .profiler-queries .tag {
-  color: #800000;
-}
-.profiler-result .profiler-queries .atn {
-  color: #ff0000;
-}
-.profiler-result .profiler-queries .atv {
-  color: #0000ff;
-}
-.profiler-result .profiler-queries .dec {
-  color: #800080;
-}
-.profiler-result .profiler-warning,
-.profiler-result .profiler-warning *,
-.profiler-result .profiler-warning .profiler-queries-show,
-.profiler-result .profiler-warning .profiler-queries-show .profiler-unit {
-  color: #f00;
-}
-.profiler-result .profiler-warning:hover,
-.profiler-result .profiler-warning *:hover,
-.profiler-result .profiler-warning .profiler-queries-show:hover,
-.profiler-result .profiler-warning .profiler-queries-show .profiler-unit:hover {
-  color: #f00;
-}
-.profiler-result .profiler-nuclear {
-  color: #f00;
-  font-weight: bold;
-  padding-right: 2px;
-}
-.profiler-result .profiler-nuclear:hover {
-  color: #f00;
-}
-.profiler-results {
-  z-index: 2147483643;
-  position: fixed;
-  top: 0px;
-}
-.profiler-results.profiler-left {
-  left: 0px;
-}
-.profiler-results.profiler-left.profiler-no-controls .profiler-result:last-child .profiler-button,
-.profiler-results.profiler-left .profiler-controls {
-  -webkit-border-bottom-right-radius: 10px;
-  -moz-border-radius-bottomright: 10px;
-  border-bottom-right-radius: 10px;
-}
-.profiler-results.profiler-left .profiler-button,
-.profiler-results.profiler-left .profiler-controls {
-  border-right: 1px solid #888888;
-}
-.profiler-results.profiler-right {
-  right: 0px;
-}
-.profiler-results.profiler-right.profiler-no-controls .profiler-result:last-child .profiler-button,
-.profiler-results.profiler-right .profiler-controls {
-  -webkit-border-bottom-left-radius: 10px;
-  -moz-border-radius-bottomleft: 10px;
-  border-bottom-left-radius: 10px;
-}
-.profiler-results.profiler-right .profiler-button,
-.profiler-results.profiler-right .profiler-controls {
-  border-left: 1px solid #888888;
-}
-.profiler-results .profiler-button,
-.profiler-results .profiler-controls {
-  display: none;
-  z-index: 2147483640;
-  border-bottom: 1px solid #888888;
-  background-color: #fff;
-  padding: 4px 7px;
-  text-align: right;
-  cursor: pointer;
-}
-.profiler-results .profiler-button.profiler-button-active,
-.profiler-results .profiler-controls.profiler-button-active {
-  background-color: maroon;
-}
-.profiler-results .profiler-button.profiler-button-active .profiler-number,
-.profiler-results .profiler-controls.profiler-button-active .profiler-number,
-.profiler-results .profiler-button.profiler-button-active .profiler-nuclear,
-.profiler-results .profiler-controls.profiler-button-active .profiler-nuclear {
-  color: #fff;
-  font-weight: bold;
-}
-.profiler-results .profiler-button.profiler-button-active .profiler-unit,
-.profiler-results .profiler-controls.profiler-button-active .profiler-unit {
-  color: #fff;
-  font-weight: normal;
-}
-.profiler-results .profiler-controls {
-  display: block;
-  font-size: 12px;
-  font-family: Consolas, monospace, serif;
-  cursor: default;
-  text-align: center;
-}
-.profiler-results .profiler-controls span {
-  border-right: 1px solid #aaaaaa;
-  padding-right: 5px;
-  margin-right: 5px;
-  cursor: pointer;
-}
-.profiler-results .profiler-controls span:last-child {
-  border-right: none;
-}
-.profiler-results .profiler-popup {
-  display: none;
-  z-index: 2147483641;
-  position: absolute;
-  background-color: #fff;
-  border: 1px solid #aaa;
-  padding: 5px 10px;
-  text-align: left;
-  line-height: 18px;
-  overflow: auto;
-  -moz-box-shadow: 0px 1px 15px #555555;
-  -webkit-box-shadow: 0px 1px 15px #555555;
-  box-shadow: 0px 1px 15px #555555;
-}
-.profiler-results .profiler-popup .profiler-info {
-  margin-bottom: 3px;
-  padding-bottom: 2px;
-  border-bottom: 1px solid #ddd;
-}
-.profiler-results .profiler-popup .profiler-info .profiler-name {
-  font-size: 110%;
-  font-weight: bold;
-}
-.profiler-results .profiler-popup .profiler-info .profiler-name .profiler-overall-duration {
-  display: none;
-}
-.profiler-results .profiler-popup .profiler-info .profiler-server-time {
-  font-size: 95%;
-}
-.profiler-results .profiler-popup .profiler-timings th,
-.profiler-results .profiler-popup .profiler-timings td {
-  padding-left: 6px;
-  padding-right: 6px;
-}
-.profiler-results .profiler-popup .profiler-timings th {
-  font-size: 95%;
-  padding-bottom: 3px;
-}
-.profiler-results .profiler-popup .profiler-timings .profiler-label {
-  max-width: 275px;
-}
-.profiler-results .profiler-queries {
-  display: none;
-  z-index: 2147483643;
-  position: absolute;
-  overflow-y: auto;
-  overflow-x: auto;
-  background-color: #fff;
-}
-.profiler-results .profiler-queries th {
-  font-size: 17px;
-}
-.profiler-results.profiler-min .profiler-result {
-  display: none;
-}
-.profiler-results.profiler-min .profiler-controls span {
-  display: none;
-}
-.profiler-results.profiler-min .profiler-controls .profiler-min-max {
-  border-right: none;
-  padding: 0px;
-  margin: 0px;
-}
-.profiler-queries-bg {
-  z-index: 2147483642;
-  display: none;
-  background: #000;
-  opacity: 0.7;
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  min-width: 100%;
-}
-.profiler-result-full .profiler-result {
-  width: 950px;
-  margin: 30px auto;
-}
-.profiler-result-full .profiler-result .profiler-button {
-  display: none;
-}
-.profiler-result-full .profiler-result .profiler-popup .profiler-info {
-  font-size: 25px;
-  border-bottom: 1px solid #aaaaaa;
-  padding-bottom: 3px;
-  margin-bottom: 25px;
-}
-.profiler-result-full .profiler-result .profiler-popup .profiler-info .profiler-overall-duration {
-  padding-right: 20px;
-  font-size: 80%;
-  color: #888;
-}
-.profiler-result-full .profiler-result .profiler-popup .profiler-timings td,
-.profiler-result-full .profiler-result .profiler-popup .profiler-timings th {
-  padding-left: 8px;
-  padding-right: 8px;
-}
-.profiler-result-full .profiler-result .profiler-popup .profiler-timings th {
-  padding-bottom: 7px;
-}
-.profiler-result-full .profiler-result .profiler-popup .profiler-timings td {
-  font-size: 14px;
-  padding-bottom: 4px;
-}
-.profiler-result-full .profiler-result .profiler-popup .profiler-timings td:first-child {
-  padding-left: 10px;
-}
-.profiler-result-full .profiler-result .profiler-popup .profiler-timings .profiler-label {
-  max-width: 550px;
-}
-.profiler-result-full .profiler-result .profiler-queries {
-  margin: 25px 0;
-}
-.profiler-result-full .profiler-result .profiler-queries table {
-  width: 100%;
-}
-.profiler-result-full .profiler-result .profiler-queries th {
-  font-size: 16px;
-  color: #555;
-  line-height: 20px;
-}
-.profiler-result-full .profiler-result .profiler-queries td {
-  padding: 15px 10px;
-  text-align: left;
-}
-.profiler-result-full .profiler-result .profiler-queries .profiler-info div {
-  text-align: right;
-  margin-bottom: 5px;
-}
diff --git a/lib/rack-mini-profiler/lib/html/includes.js b/lib/rack-mini-profiler/lib/html/includes.js
deleted file mode 100644
index d8b4de083..000000000
--- a/lib/rack-mini-profiler/lib/html/includes.js
+++ /dev/null
@@ -1,960 +0,0 @@
-"use strict";
-var MiniProfiler = (function () {
-    var $;
-
-    var options,
-        container,
-        controls,
-        fetchedIds = [],
-        fetchingIds = [], // so we never pull down a profiler twice
-        ajaxStartTime
-        ;
-
-    var hasLocalStorage = function () {
-        try {
-            return 'localStorage' in window && window['localStorage'] !== null;
-        } catch (e) {
-            return false;
-        }
-    };
-
-    var getVersionedKey = function (keyPrefix) {
-        return keyPrefix + '-' + options.version;
-    };
-
-    var save = function (keyPrefix, value) {
-        if (!hasLocalStorage()) { return; }
-
-        // clear old keys with this prefix, if any
-        for (var i = 0; i < localStorage.length; i++) {
-            if ((localStorage.key(i) || '').indexOf(keyPrefix) > -1) {
-                localStorage.removeItem(localStorage.key(i));
-            }
-        }
-
-        // save under this version
-        localStorage[getVersionedKey(keyPrefix)] = value;
-    };
-
-    var load = function (keyPrefix) {
-        if (!hasLocalStorage()) { return null; }
-
-        return localStorage[getVersionedKey(keyPrefix)];
-    };
-
-    var fetchTemplates = function (success) {
-        var key = 'templates',
-            cached = load(key);
-
-        if (cached) {
-            $('body').append(cached);
-            success();
-        }
-        else {
-            $.get(options.path + 'includes.tmpl?v=' + options.version, function (data) {
-                if (data) {
-                    save(key, data);
-                    $('body').append(data);
-                    success();
-                }
-            });
-        }
-    };
-
-    var getClientPerformance = function() {
-        return window.performance == null ? null : window.performance;
-    };
-
-    var fetchResults = function (ids) {
-        var clientPerformance, clientProbes, i, j, p, id, idx;
-
-        for (i = 0; i < ids.length; i++) {
-            id = ids[i];
-
-            clientPerformance = null;
-            clientProbes = null;
-
-            if (window.mPt) {
-                clientProbes = mPt.results();
-                for (j = 0; j < clientProbes.length; j++) {
-                    clientProbes[j].d = clientProbes[j].d.getTime();
-                }
-                mPt.flush();
-            }
-
-            if (id == options.currentId) {
-
-                clientPerformance = getClientPerformance();
-
-                if (clientPerformance != null) {
-                    // ie is buggy strip out functions
-                    var copy = { navigation: {}, timing: {} };
-
-                    var timing = $.extend({}, clientPerformance.timing);
-
-                    for (p in timing) {
-                        if (timing.hasOwnProperty(p) && !$.isFunction(timing[p])) {
-                            copy.timing[p] = timing[p];
-                        }
-                    }
-                    if (clientPerformance.navigation) {
-                        copy.navigation.redirectCount = clientPerformance.navigation.redirectCount;
-                    }
-                    clientPerformance = copy;
-
-                    // hack to add chrome timings
-                    if (window.chrome && window.chrome.loadTimes) {
-                      var chromeTimes = window.chrome.loadTimes();
-                      if (chromeTimes.firstPaintTime) {
-                        clientPerformance.timing["First Paint Time"] = Math.round(chromeTimes.firstPaintTime * 1000);
-                      }
-                      if (chromeTimes.firstPaintTime) {
-                        clientPerformance.timing["First Paint After Load Time"] = Math.round(chromeTimes.firstPaintAfterLoadTime * 1000);
-                      }
-
-                    }
-                }
-            } else if (ajaxStartTime != null && clientProbes && clientProbes.length > 0) {
-                clientPerformance = { timing: { navigationStart: ajaxStartTime.getTime() } };
-                ajaxStartTime = null;
-            }
-
-            if ($.inArray(id, fetchedIds) < 0 && $.inArray(id, fetchingIds) < 0) {
-                idx = fetchingIds.push(id) - 1;
-
-                $.ajax({
-                    url: options.path + 'results',
-                    data: { id: id, clientPerformance: clientPerformance, clientProbes: clientProbes, popup: 1 },
-                    dataType: 'json',
-                    global: false,
-                    type: 'POST',
-                    success: function (json) {
-                        fetchedIds.push(id);
-                        if (json != "hidden") {
-                            buttonShow(json);
-                        }
-                    },
-                    complete: function () {
-                        fetchingIds.splice(idx, 1);
-                    }
-                });
-            }
-        }
-    };
-
-    var renderTemplate = function (json) {
-        return $('#profilerTemplate').tmpl(json);
-    };
-
-    var buttonShow = function (json) {
-        var result = renderTemplate(json);
-
-        if (controls)
-            result.insertBefore(controls);
-        else
-            result.appendTo(container);
-
-        var button = result.find('.profiler-button'),
-            popup = result.find('.profiler-popup');
-
-        // button will appear in corner with the total profiling duration - click to show details
-        button.click(function () { buttonClick(button, popup); });
-
-        // small duration steps and the column with aggregate durations are hidden by default; allow toggling
-        toggleHidden(popup);
-
-        // lightbox in the queries
-        popup.find('.profiler-queries-show').click(function () { queriesShow($(this), result); });
-
-        // limit count
-        if (container.find('.profiler-result').length > options.maxTracesToShow)
-            container.find('.profiler-result').first().remove();
-        button.show();
-    };
-
-    var toggleHidden = function (popup) {
-        var trivial = popup.find('.profiler-toggle-trivial');
-        var childrenTime = popup.find('.profiler-toggle-duration-with-children');
-        var trivialGaps = popup.parent().find('.profiler-toggle-trivial-gaps');
-
-        var toggleIt = function (node) {
-            var link = $(node),
-                klass = "profiler-" + link.attr('class').substr('profiler-toggle-'.length),
-                isHidden = link.text().indexOf('show') > -1;
-
-            popup.parent().find('.' + klass).toggle(isHidden);
-            link.text(link.text().replace(isHidden ? 'show' : 'hide', isHidden ? 'hide' : 'show'));
-
-            popupPreventHorizontalScroll(popup);
-        };
-
-        childrenTime.add(trivial).add(trivialGaps).click(function () {
-            toggleIt(this);
-        });
-
-        // if option is set or all our timings are trivial, go ahead and show them
-        if (options.showTrivial || trivial.data('show-on-load')) {
-            toggleIt(trivial);
-        }
-        // if option is set, go ahead and show time with children
-        if (options.showChildrenTime) {
-            toggleIt(childrenTime);
-        }
-    };
-
-    var buttonClick = function (button, popup) {
-        // we're toggling this button/popup
-        if (popup.is(':visible')) {
-            popupHide(button, popup);
-        }
-        else {
-            var visiblePopups = container.find('.profiler-popup:visible'),
-                theirButtons = visiblePopups.siblings('.profiler-button');
-
-            // hide any other popups
-            popupHide(theirButtons, visiblePopups);
-
-            // before showing the one we clicked
-            popupShow(button, popup);
-        }
-    };
-
-    var popupShow = function (button, popup) {
-        button.addClass('profiler-button-active');
-
-        popupSetDimensions(button, popup);
-
-        popup.show();
-
-        popupPreventHorizontalScroll(popup);
-    };
-
-    var popupSetDimensions = function (button, popup) {
-        var top = button.position().top - 1, // position next to the button we clicked
-            windowHeight = $(window).height(),
-            maxHeight = windowHeight - top - 40; // make sure the popup doesn't extend below the fold
-
-        popup
-            .css({ 'top': top, 'max-height': maxHeight })
-            .css(options.renderPosition, button.outerWidth() - 3); // move left or right, based on config
-    };
-
-    var popupPreventHorizontalScroll = function (popup) {
-        var childrenHeight = 0;
-
-        popup.children().each(function () { childrenHeight += $(this).height(); });
-
-        popup.css({ 'padding-right': childrenHeight > popup.height() ? 40 : 10 });
-    };
-
-    var popupHide = function (button, popup) {
-        button.removeClass('profiler-button-active');
-        popup.hide();
-    };
-
-    var queriesShow = function (link, result) {
-
-        var px = 30,
-            win = $(window),
-            width = win.width() - 2 * px,
-            height = win.height() - 2 * px,
-            queries = result.find('.profiler-queries');
-
-        // opaque background
-        $('<div class="profiler-queries-bg"/>').appendTo('body').css({ 'height': $(document).height() }).show();
-
-        // center the queries and ensure long content is scrolled
-        queries.css({ 'top': px, 'max-height': height, 'width': width }).css(options.renderPosition, px)
-            .find('table').css({ 'width': width });
-
-        // have to show everything before we can get a position for the first query
-        queries.show();
-
-        queriesScrollIntoView(link, queries, queries);
-
-        // syntax highlighting
-        prettyPrint();
-    };
-
-    var queriesScrollIntoView = function (link, queries, whatToScroll) {
-        var id = link.closest('tr').attr('data-timing-id'),
-            cells = queries.find('tr[data-timing-id="' + id + '"] td');
-
-        // ensure they're in view
-        whatToScroll.scrollTop(whatToScroll.scrollTop() + cells.first().position().top - 100);
-
-        // highlight and then fade back to original bg color; do it ourselves to prevent any conflicts w/ jquery.UI or other implementations of Resig's color plugin
-        cells.each(function () {
-            var cell = $(this),
-                highlightHex = '#FFFFBB',
-                highlightRgb = getRGB(highlightHex),
-                originalRgb = getRGB(cell.css('background-color')),
-                getColorDiff = function (fx, i) {
-                    // adapted from John Resig's color plugin: http://plugins.jquery.com/project/color
-                    return Math.max(Math.min(parseInt((fx.pos * (originalRgb[i] - highlightRgb[i])) + highlightRgb[i], 10), 255), 0);
-                };
-
-            // we need to animate some other property to piggy-back on the step function, so I choose you, opacity!
-            cell.css({ 'opacity': 1, 'background-color': highlightHex })
-                .animate({ 'opacity': 1 }, { duration: 2000, step: function (now, fx) {
-                    fx.elem.style.backgroundColor = "rgb(" + [getColorDiff(fx, 0), getColorDiff(fx, 1), getColorDiff(fx, 2)].join(",") + ")";
-                }
-                });
-        });
-    };
-
-    // Color Conversion functions from highlightFade
-    // By Blair Mitchelmore
-    // http://jquery.offput.ca/highlightFade/
-    // Parse strings looking for color tuples [255,255,255]
-    var getRGB = function (color) {
-        var result;
-
-        // Check if we're already dealing with an array of colors
-        if (color && color.constructor == Array && color.length == 3) return color;
-
-        // Look for rgb(num,num,num)
-        if (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color)) return [parseInt(result[1]), parseInt(result[2]), parseInt(result[3])];
-
-        // Look for rgb(num%,num%,num%)
-        if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color)) return [parseFloat(result[1]) * 2.55, parseFloat(result[2]) * 2.55, parseFloat(result[3]) * 2.55];
-
-        // Look for #a0b1c2
-        if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color)) return [parseInt(result[1], 16), parseInt(result[2], 16), parseInt(result[3], 16)];
-
-        // Look for #fff
-        if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color)) return [parseInt(result[1] + result[1], 16), parseInt(result[2] + result[2], 16), parseInt(result[3] + result[3], 16)];
-
-        // Look for rgba(0, 0, 0, 0) == transparent in Safari 3
-        if (result = /rgba\(0, 0, 0, 0\)/.exec(color)) return colors['transparent'];
-
-        return null;
-    };
-
-    var bindDocumentEvents = function () {
-        $(document).bind('click keyup', function (e) {
-
-            // this happens on every keystroke, and :visible is crazy expensive in IE <9
-            // and in this case, the display:none check is sufficient.
-            var popup = $('.profiler-popup').filter(function () { return $(this).css("display") !== "none"; });
-
-            if (!popup.length) {
-                return;
-            }
-
-            var button = popup.siblings('.profiler-button'),
-                queries = popup.closest('.profiler-result').find('.profiler-queries'),
-                bg = $('.profiler-queries-bg'),
-                isEscPress = e.type == 'keyup' && e.which == 27,
-                hidePopup = false,
-                hideQueries = false;
-
-            if (bg.is(':visible')) {
-                hideQueries = isEscPress || (e.type == 'click' && !$.contains(queries[0], e.target) && !$.contains(popup[0], e.target));
-            }
-            else if (popup.is(':visible')) {
-                hidePopup = isEscPress || (e.type == 'click' && !$.contains(popup[0], e.target) && !$.contains(button[0], e.target) && button[0] != e.target);
-            }
-
-            if (hideQueries) {
-                bg.remove();
-                queries.hide();
-            }
-
-            if (hidePopup) {
-                popupHide(button, popup);
-            }
-        });
-        $(document).bind('keydown', options.toggleShortcut, function(e) {
-            $('.profiler-results').toggle();
-        });
-    };
-
-    var initFullView = function () {
-
-        // first, get jquery tmpl, then render and bind handlers
-        fetchTemplates(function () {
-
-            // profiler will be defined in the full page's head
-            renderTemplate(profiler).appendTo(container);
-
-            var popup = $('.profiler-popup');
-
-            toggleHidden(popup);
-
-            prettyPrint();
-
-            // since queries are already shown, just highlight and scroll when clicking a "1 sql" link
-            popup.find('.profiler-queries-show').click(function () {
-                queriesScrollIntoView($(this), $('.profiler-queries'), $(document));
-            });
-        });
-    };
-
-    var initControls = function (container) {
-        if (options.showControls) {
-            controls = $('<div class="profiler-controls"><span class="profiler-min-max">m</span><span class="profiler-clear">c</span></div>').appendTo(container);
-
-            $('.profiler-controls .profiler-min-max').click(function () {
-                container.toggleClass('profiler-min');
-            });
-
-            container.hover(function () {
-                if ($(this).hasClass('profiler-min')) {
-                    $(this).find('.profiler-min-max').show();
-                }
-            },
-            function () {
-                if ($(this).hasClass('profiler-min')) {
-                    $(this).find('.profiler-min-max').hide();
-                }
-            });
-
-            $('.profiler-controls .profiler-clear').click(function () {
-                container.find('.profiler-result').remove();
-            });
-        }
-        else {
-            container.addClass('profiler-no-controls');
-        }
-    };
-
-    var initPopupView = function () {
-
-        if (options.authorized) {
-            // all fetched profilings will go in here
-            container = $('<div class="profiler-results"/>').appendTo('body');
-
-            // MiniProfiler.RenderIncludes() sets which corner to render in - default is upper left
-            container.addClass("profiler-" + options.renderPosition);
-
-            //initialize the controls
-            initControls(container);
-
-            // we'll render results json via a jquery.tmpl - after we get the templates, we'll fetch the initial json to populate it
-            fetchTemplates(function () {
-                // get master page profiler results
-                fetchResults(options.ids);
-            });
-            if (options.startHidden) container.hide();
-        }
-        else {
-            fetchResults(options.ids);
-        }
-
-        var jQueryAjaxComplete = function (e, xhr, settings) {
-            if (xhr) {
-                // should be an array of strings, e.g. ["008c4813-9bd7-443d-9376-9441ec4d6a8c","16ff377b-8b9c-4c20-a7b5-97cd9fa7eea7"]
-                var stringIds = xhr.getResponseHeader('X-MiniProfiler-Ids');
-                if (stringIds) {
-                    var ids = typeof JSON != 'undefined' ? JSON.parse(stringIds) : eval(stringIds);
-                    fetchResults(ids);
-                }
-            }
-        };
-
-        // fetch profile results for any ajax calls
-        // note, this does not use $ cause we want to hook into the main jQuery
-        if (jQuery && jQuery(document) && jQuery(document).ajaxComplete) {
-            jQuery(document).ajaxComplete(jQueryAjaxComplete);
-        }
-
-        if (jQuery && jQuery(document).ajaxStart)
-            jQuery(document).ajaxStart(function () { ajaxStartTime = new Date(); });
-
-        // fetch results after ASP Ajax calls
-        if (typeof (Sys) != 'undefined' && typeof (Sys.WebForms) != 'undefined' && typeof (Sys.WebForms.PageRequestManager) != 'undefined') {
-            // Get the instance of PageRequestManager.
-            var PageRequestManager = Sys.WebForms.PageRequestManager.getInstance();
-
-            PageRequestManager.add_endRequest(function (sender, args) {
-                if (args) {
-                    var response = args.get_response();
-                    if (response.get_responseAvailable() && response._xmlHttpRequest != null) {
-                        var stringIds = args.get_response().getResponseHeader('X-MiniProfiler-Ids');
-                        if (stringIds) {
-                            var ids = typeof JSON != 'undefined' ? JSON.parse(stringIds) : eval(stringIds);
-                            fetchResults(ids);
-                        }
-                    }
-                }
-            });
-        }
-
-        // more Asp.Net callbacks
-        if (typeof (WebForm_ExecuteCallback) == "function") {
-            WebForm_ExecuteCallback = (function (callbackObject) {
-                // Store original function
-                var original = WebForm_ExecuteCallback;
-
-                return function (callbackObject) {
-                    original(callbackObject);
-
-                    var stringIds = callbackObject.xmlRequest.getResponseHeader('X-MiniProfiler-Ids');
-                    if (stringIds) {
-                        var ids = typeof JSON != 'undefined' ? JSON.parse(stringIds) : eval(stringIds);
-                        fetchResults(ids);
-                    }
-                };
-
-            })();
-        }
-
-        // also fetch results after ExtJS requests, in case it is being used
-        if (typeof (Ext) != 'undefined' && typeof (Ext.Ajax) != 'undefined' && typeof (Ext.Ajax.on) != 'undefined') {
-            // Ext.Ajax is a singleton, so we just have to attach to its 'requestcomplete' event
-            Ext.Ajax.on('requestcomplete', function (e, xhr, settings) {
-                //iframed file uploads don't have headers
-                if (!xhr || !xhr.getResponseHeader) {
-                    return;
-                }
-
-                var stringIds = xhr.getResponseHeader('X-MiniProfiler-Ids');
-                if (stringIds) {
-                    var ids = typeof JSON != 'undefined' ? JSON.parse(stringIds) : eval(stringIds);
-                    fetchResults(ids);
-                }
-            });
-        }
-
-        if (typeof (MooTools) != 'undefined' && typeof (Request) != 'undefined') {
-          Request.prototype.addEvents({
-            onComplete: function() {
-              var stringIds = this.xhr.getResponseHeader('X-MiniProfiler-Ids');
-              if (stringIds) {
-                var ids = typeof JSON != 'undefined' ? JSON.parse(stringIds) : eval(stringIds);
-                fetchResults(ids);
-              }
-            }
-          });
-        }
-
-        // add support for AngularJS, which use the basic XMLHttpRequest object.
-        if (window.angular && typeof (XMLHttpRequest) != 'undefined') {
-          var _send = XMLHttpRequest.prototype.send;
-
-          XMLHttpRequest.prototype.send = function sendReplacement(data) {
-            this._onreadystatechange = this.onreadystatechange;
-
-            this.onreadystatechange = function onReadyStateChangeReplacement() {
-              if (this.readyState == 4) {
-                var stringIds = this.getResponseHeader('X-MiniProfiler-Ids');
-                if (stringIds) {
-                  var ids = typeof JSON != 'undefined' ? JSON.parse(stringIds) : eval(stringIds);
-                  fetchResults(ids);
-                }
-              }
-
-              return this._onreadystatechange.apply(this, arguments);
-            };
-
-            return _send.apply(this, arguments);
-          };
-        }
-
-        // some elements want to be hidden on certain doc events
-        bindDocumentEvents();
-    };
-
-    return {
-
-        init: function () {
-            var script = document.getElementById('mini-profiler');
-            if (!script || !script.getAttribute) return;
-
-            options = (function () {
-                var version = script.getAttribute('data-version');
-                var path = script.getAttribute('data-path');
-
-                var currentId = script.getAttribute('data-current-id');
-
-                var ids = script.getAttribute('data-ids');
-                if (ids)  ids = ids.split(',');
-
-                var position = script.getAttribute('data-position');
-
-                var toggleShortcut = script.getAttribute('data-toggle-shortcut');
-
-                if (script.getAttribute('data-max-traces')) {
-                    var maxTraces = parseInt(script.getAttribute('data-max-traces'), 10);
-                }
-
-                if (script.getAttribute('data-trivial') === 'true') var trivial = true;
-                if (script.getAttribute('data-children') == 'true') var children = true;
-                if (script.getAttribute('data-controls') == 'true') var controls = true;
-                if (script.getAttribute('data-authorized') == 'true') var authorized = true;
-                if (script.getAttribute('data-start-hidden') == 'true') var startHidden = true;
-
-                return {
-                    ids: ids,
-                    path: path,
-                    version: version,
-                    renderPosition: position,
-                    showTrivial: trivial,
-                    showChildrenTime: children,
-                    maxTracesToShow: maxTraces,
-                    showControls: controls,
-                    currentId: currentId,
-                    authorized: authorized,
-                    toggleShortcut: toggleShortcut,
-                    startHidden: startHidden
-                };
-            })();
-
-            var doInit = function () {
-                // when rendering a shared, full page, this div will exist
-                container = $('.profiler-result-full');
-                if (container.length) {
-                    if (window.location.href.indexOf("&trivial=1") > 0) {
-                        options.showTrivial = true;
-                    }
-                    initFullView();
-                }
-                else {
-                    initPopupView();
-                }
-            };
-
-            // this preserves debugging
-            var load = function (s, f) {
-                var sc = document.createElement("script");
-                sc.async = "async";
-                sc.type = "text/javascript";
-                sc.src = s;
-                var done = false;
-                sc.onload = sc.onreadystatechange = function (_, abort) {
-                    if (!sc.readyState || /loaded|complete/.test(sc.readyState)) {
-                        if (!abort && !done) { done = true; f(); }
-                    }
-                };
-                document.getElementsByTagName('head')[0].appendChild(sc);
-            };
-
-            var wait = 0;
-            var finish = false;
-            var deferInit = function() {
-                if (finish) return;
-                if (window.performance && window.performance.timing && window.performance.timing.loadEventEnd === 0 && wait < 10000) {
-                    setTimeout(deferInit, 100);
-                    wait += 100;
-                } else {
-                    finish = true;
-                    init();
-                }
-            };
-
-            var init = function() {
-                if (options.authorized) {
-                    var url = options.path + "includes.css?v=" + options.version;
-                    if (document.createStyleSheet) {
-                        document.createStyleSheet(url);
-                    } else {
-                        $('head').append($('<link rel="stylesheet" type="text/css" href="' + url + '" />'));
-                    }
-                    if (!$.tmpl) {
-                        load(options.path + 'jquery.tmpl.js?v=' + options.version, doInit);
-                    } else {
-                        doInit();
-                    }
-                } else {
-                    doInit();
-                }
-
-                // jquery.hotkeys.js
-                // https://github.com/jeresig/jquery.hotkeys/blob/master/jquery.hotkeys.js
-
-                (function(d){function h(g){if("string"===typeof g.data){var h=g.handler,j=g.data.toLowerCase().split(" ");g.handler=function(b){if(!(this!==b.target&&(/textarea|select/i.test(b.target.nodeName)||"text"===b.target.type))){var c="keypress"!==b.type&&d.hotkeys.specialKeys[b.which],e=String.fromCharCode(b.which).toLowerCase(),a="",f={};b.altKey&&"alt"!==c&&(a+="alt+");b.ctrlKey&&"ctrl"!==c&&(a+="ctrl+");b.metaKey&&(!b.ctrlKey&&"meta"!==c)&&(a+="meta+");b.shiftKey&&"shift"!==c&&(a+="shift+");c?f[a+c]=
-                !0:(f[a+e]=!0,f[a+d.hotkeys.shiftNums[e]]=!0,"shift+"===a&&(f[d.hotkeys.shiftNums[e]]=!0));c=0;for(e=j.length;c<e;c++)if(f[j[c]])return h.apply(this,arguments)}}}}d.hotkeys={version:"0.8",specialKeys:{8:"backspace",9:"tab",13:"return",16:"shift",17:"ctrl",18:"alt",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",
-                109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",191:"/",224:"meta"},shiftNums:{"`":"~",1:"!",2:"@",3:"#",4:"$",5:"%",6:"^",7:"&",8:"*",9:"(","0":")","-":"_","=":"+",";":": ","'":'"',",":"<",".":">","/":"?","\\":"|"}};d.each(["keydown","keyup","keypress"],function(){d.event.special[this]={add:h}})})(MiniProfiler.jQuery);
-
-            };
-
-            var major, minor;
-            if (typeof(jQuery) == 'function') {
-                var jQueryVersion = jQuery.fn.jquery.split('.');
-                major = parseInt(jQueryVersion[0], 10);
-                minor = parseInt(jQueryVersion[1], 10);
-            }
-
-
-            if (major === 2 || (major === 1 && minor >= 7)) {
-                MiniProfiler.jQuery = $ = jQuery;
-                $(deferInit);
-            } else {
-                load(options.path + "jquery.1.7.1.js?v=" + options.version, function() {
-                    MiniProfiler.jQuery = $ = jQuery.noConflict(true);
-                    $(deferInit);
-                });
-            }
-        },
-
-        getClientTimingByName: function (clientTiming, name) {
-
-            for (var i = 0; i < clientTiming.Timings.length; i++) {
-                if (clientTiming.Timings[i].Name == name) {
-                    return clientTiming.Timings[i];
-                }
-            }
-            return { Name: name, Duration: "", Start: "" };
-        },
-
-        renderDate: function (jsonDate) { // JavaScriptSerializer sends dates as /Date(1308024322065)/
-            if (jsonDate) {
-                return (typeof jsonDate === 'string') ? new Date(parseInt(jsonDate.replace("/Date(", "").replace(")/", ""), 10)).toUTCString() : jsonDate;
-            }
-        },
-
-        renderIndent: function (depth) {
-            var result = '';
-            for (var i = 0; i < depth; i++) {
-                result += '&nbsp;';
-            }
-            return result;
-        },
-
-        renderExecuteType: function (typeId) {
-            // see StackExchange.Profiling.ExecuteType enum
-            switch (typeId) {
-                case 0: return 'None';
-                case 1: return 'NonQuery';
-                case 2: return 'Scalar';
-                case 3: return 'Reader';
-            }
-        },
-
-        shareUrl: function (id) {
-            return options.path + 'results?id=' + id;
-        },
-
-        getClientTimings: function (clientTimings) {
-            var list = [];
-            var t;
-
-            if (!clientTimings.Timings) return [];
-
-            for (var i = 0; i < clientTimings.Timings.length; i++) {
-                t = clientTimings.Timings[i];
-                var trivial = t.Name != "Dom Complete" && t.Name != "Response" && t.Name != "First Paint Time";
-                trivial = t.Duration < 2 ? trivial : false;
-                list.push(
-                {
-                    isTrivial: trivial,
-                    name: t.Name,
-                    duration: t.Duration,
-                    start: t.Start
-                });
-            }
-
-            list.sort(function (a, b) { return a.start - b.start; });
-            return list;
-        },
-
-        getSqlTimings: function (root) {
-            var result = [],
-                addToResults = function (timing) {
-                    if (timing.SqlTimings) {
-                        for (var i = 0, sqlTiming; i < timing.SqlTimings.length; i++) {
-                            sqlTiming = timing.SqlTimings[i];
-
-                            // HACK: add info about the parent Timing to each SqlTiming so UI can render
-                            sqlTiming.ParentTimingName = timing.Name;
-                            result.push(sqlTiming);
-                        }
-                    }
-
-                    if (timing.Children) {
-                        for (var i = 0; i < timing.Children.length; i++) {
-                            addToResults(timing.Children[i]);
-                        }
-                    }
-                };
-
-            // start adding at the root and recurse down
-            addToResults(root);
-
-            var removeDuration = function(list, duration) {
-
-                var newList = [];
-                for (var i = 0; i < list.length; i++) {
-
-                    var item = list[i];
-                    if (duration.start > item.start) {
-                        if (duration.start > item.finish) {
-                            newList.push(item);
-                            continue;
-                        }
-                        newList.push({ start: item.start, finish: duration.start });
-                    }
-
-                    if (duration.finish < item.finish) {
-                        if (duration.finish < item.start) {
-                            newList.push(item);
-                            continue;
-                        }
-                        newList.push({ start: duration.finish, finish: item.finish });
-                    }
-                }
-
-                return newList;
-            };
-
-            var processTimes = function (elem, parent) {
-                var duration = { start: elem.StartMilliseconds, finish: (elem.StartMilliseconds + elem.DurationMilliseconds) };
-                elem.richTiming = [duration];
-                if (parent != null) {
-                    elem.parent = parent;
-                    elem.parent.richTiming = removeDuration(elem.parent.richTiming, duration);
-                }
-
-                if (elem.Children) {
-                    for (var i = 0; i < elem.Children.length; i++) {
-                        processTimes(elem.Children[i], elem);
-                    }
-                }
-            };
-
-            processTimes(root, null);
-
-            // sort results by time
-            result.sort(function (a, b) { return a.StartMilliseconds - b.StartMilliseconds; });
-
-            var determineOverlap = function(gap, node) {
-                var overlap = 0;
-                for (var i = 0; i < node.richTiming.length; i++) {
-                    var current = node.richTiming[i];
-                    if (current.start > gap.finish) {
-                        break;
-                    }
-                    if (current.finish < gap.start) {
-                        continue;
-                    }
-
-                    overlap += Math.min(gap.finish, current.finish) - Math.max(gap.start, current.start);
-                }
-                return overlap;
-            };
-
-            var determineGap = function (gap, node, match) {
-                var overlap = determineOverlap(gap, node);
-                if (match == null || overlap > match.duration) {
-                    match = { name: node.Name, duration: overlap };
-                }
-                else if (match.name == node.Name) {
-                    match.duration += overlap;
-                }
-
-                if (node.Children) {
-                    for (var i = 0; i < node.Children.length; i++) {
-                        match = determineGap(gap, node.Children[i], match);
-                    }
-                }
-                return match;
-            };
-
-            var time = 0;
-            var prev = null;
-            $.each(result, function () {
-                this.prevGap = {
-                    duration: (this.StartMilliseconds - time).toFixed(2),
-                    start: time,
-                    finish: this.StartMilliseconds
-                };
-
-                this.prevGap.topReason = determineGap(this.prevGap, root, null);
-
-                time = this.StartMilliseconds + this.DurationMilliseconds;
-                prev = this;
-            });
-
-
-            if (result.length > 0) {
-                var me = result[result.length - 1];
-                me.nextGap = {
-                    duration: (root.DurationMilliseconds - time).toFixed(2),
-                    start: time,
-                    finish: root.DurationMilliseconds
-                };
-                me.nextGap.topReason = determineGap(me.nextGap, root, null);
-            }
-
-            return result;
-        },
-
-        getSqlTimingsCount: function (root) {
-            var result = 0,
-                countSql = function (timing) {
-                    if (timing.SqlTimings) {
-                        result += timing.SqlTimings.length;
-                    }
-
-                    if (timing.Children) {
-                        for (var i = 0; i < timing.Children.length; i++) {
-                            countSql(timing.Children[i]);
-                        }
-                    }
-                };
-            countSql(root);
-            return result;
-        },
-
-        fetchResultsExposed: function (ids) {
-            return fetchResults(ids);
-        },
-
-        formatDuration: function (duration) {
-            return (duration || 0).toFixed(1);
-        }
-    };
-})();
-
-MiniProfiler.init();
-
-if (typeof prettyPrint === "undefined") {
-
-    // prettify.js
-    // http://code.google.com/p/google-code-prettify/
-
-    window.PR_SHOULD_USE_CONTINUATION=true;window.PR_TAB_WIDTH=8;window.PR_normalizedHtml=window.PR=window.prettyPrintOne=window.prettyPrint=void 0;window._pr_isIE6=function(){var y=navigator&&navigator.userAgent&&navigator.userAgent.match(/\bMSIE ([678])\./);y=y?+y[1]:false;window._pr_isIE6=function(){return y};return y};
-    (function(){function y(b){return b.replace(L,"&amp;").replace(M,"&lt;").replace(N,"&gt;")}function H(b,f,i){switch(b.nodeType){case 1:var o=b.tagName.toLowerCase();f.push("<",o);var l=b.attributes,n=l.length;if(n){if(i){for(var r=[],j=n;--j>=0;)r[j]=l[j];r.sort(function(q,m){return q.name<m.name?-1:q.name===m.name?0:1});l=r}for(j=0;j<n;++j){r=l[j];r.specified&&f.push(" ",r.name.toLowerCase(),'="',r.value.replace(L,"&amp;").replace(M,"&lt;").replace(N,"&gt;").replace(X,"&quot;"),'"')}}f.push(">");
-    for(l=b.firstChild;l;l=l.nextSibling)H(l,f,i);if(b.firstChild||!/^(?:br|link|img)$/.test(o))f.push("</",o,">");break;case 3:case 4:f.push(y(b.nodeValue));break}}function O(b){function f(c){if(c.charAt(0)!=="\\")return c.charCodeAt(0);switch(c.charAt(1)){case "b":return 8;case "t":return 9;case "n":return 10;case "v":return 11;case "f":return 12;case "r":return 13;case "u":case "x":return parseInt(c.substring(2),16)||c.charCodeAt(1);case "0":case "1":case "2":case "3":case "4":case "5":case "6":case "7":return parseInt(c.substring(1),
-    8);default:return c.charCodeAt(1)}}function i(c){if(c<32)return(c<16?"\\x0":"\\x")+c.toString(16);c=String.fromCharCode(c);if(c==="\\"||c==="-"||c==="["||c==="]")c="\\"+c;return c}function o(c){var d=c.substring(1,c.length-1).match(RegExp("\\\\u[0-9A-Fa-f]{4}|\\\\x[0-9A-Fa-f]{2}|\\\\[0-3][0-7]{0,2}|\\\\[0-7]{1,2}|\\\\[\\s\\S]|-|[^-\\\\]","g"));c=[];for(var a=[],k=d[0]==="^",e=k?1:0,h=d.length;e<h;++e){var g=d[e];switch(g){case "\\B":case "\\b":case "\\D":case "\\d":case "\\S":case "\\s":case "\\W":case "\\w":c.push(g);
-    continue}g=f(g);var s;if(e+2<h&&"-"===d[e+1]){s=f(d[e+2]);e+=2}else s=g;a.push([g,s]);if(!(s<65||g>122)){s<65||g>90||a.push([Math.max(65,g)|32,Math.min(s,90)|32]);s<97||g>122||a.push([Math.max(97,g)&-33,Math.min(s,122)&-33])}}a.sort(function(v,w){return v[0]-w[0]||w[1]-v[1]});d=[];g=[NaN,NaN];for(e=0;e<a.length;++e){h=a[e];if(h[0]<=g[1]+1)g[1]=Math.max(g[1],h[1]);else d.push(g=h)}a=["["];k&&a.push("^");a.push.apply(a,c);for(e=0;e<d.length;++e){h=d[e];a.push(i(h[0]));if(h[1]>h[0]){h[1]+1>h[0]&&a.push("-");
-    a.push(i(h[1]))}}a.push("]");return a.join("")}function l(c){for(var d=c.source.match(RegExp("(?:\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]|\\\\u[A-Fa-f0-9]{4}|\\\\x[A-Fa-f0-9]{2}|\\\\[0-9]+|\\\\[^ux0-9]|\\(\\?[:!=]|[\\(\\)\\^]|[^\\x5B\\x5C\\(\\)\\^]+)","g")),a=d.length,k=[],e=0,h=0;e<a;++e){var g=d[e];if(g==="(")++h;else if("\\"===g.charAt(0))if((g=+g.substring(1))&&g<=h)k[g]=-1}for(e=1;e<k.length;++e)if(-1===k[e])k[e]=++n;for(h=e=0;e<a;++e){g=d[e];if(g==="("){++h;if(k[h]===undefined)d[e]="(?:"}else if("\\"===
-    g.charAt(0))if((g=+g.substring(1))&&g<=h)d[e]="\\"+k[h]}for(h=e=0;e<a;++e)if("^"===d[e]&&"^"!==d[e+1])d[e]="";if(c.ignoreCase&&r)for(e=0;e<a;++e){g=d[e];c=g.charAt(0);if(g.length>=2&&c==="[")d[e]=o(g);else if(c!=="\\")d[e]=g.replace(/[a-zA-Z]/g,function(s){s=s.charCodeAt(0);return"["+String.fromCharCode(s&-33,s|32)+"]"})}return d.join("")}for(var n=0,r=false,j=false,q=0,m=b.length;q<m;++q){var t=b[q];if(t.ignoreCase)j=true;else if(/[a-z]/i.test(t.source.replace(/\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\[^ux]/gi,
-    ""))){r=true;j=false;break}}var p=[];q=0;for(m=b.length;q<m;++q){t=b[q];if(t.global||t.multiline)throw Error(""+t);p.push("(?:"+l(t)+")")}return RegExp(p.join("|"),j?"gi":"g")}function Y(b){var f=0;return function(i){for(var o=null,l=0,n=0,r=i.length;n<r;++n)switch(i.charAt(n)){case "\t":o||(o=[]);o.push(i.substring(l,n));l=b-f%b;for(f+=l;l>=0;l-=16)o.push("                ".substring(0,l));l=n+1;break;case "\n":f=0;break;default:++f}if(!o)return i;o.push(i.substring(l));return o.join("")}}function I(b,
-    f,i,o){if(f){b={source:f,c:b};i(b);o.push.apply(o,b.d)}}function B(b,f){var i={},o;(function(){for(var r=b.concat(f),j=[],q={},m=0,t=r.length;m<t;++m){var p=r[m],c=p[3];if(c)for(var d=c.length;--d>=0;)i[c.charAt(d)]=p;p=p[1];c=""+p;if(!q.hasOwnProperty(c)){j.push(p);q[c]=null}}j.push(/[\0-\uffff]/);o=O(j)})();var l=f.length;function n(r){for(var j=r.c,q=[j,z],m=0,t=r.source.match(o)||[],p={},c=0,d=t.length;c<d;++c){var a=t[c],k=p[a],e=void 0,h;if(typeof k==="string")h=false;else{var g=i[a.charAt(0)];
-    if(g){e=a.match(g[1]);k=g[0]}else{for(h=0;h<l;++h){g=f[h];if(e=a.match(g[1])){k=g[0];break}}e||(k=z)}if((h=k.length>=5&&"lang-"===k.substring(0,5))&&!(e&&typeof e[1]==="string")){h=false;k=P}h||(p[a]=k)}g=m;m+=a.length;if(h){h=e[1];var s=a.indexOf(h),v=s+h.length;if(e[2]){v=a.length-e[2].length;s=v-h.length}k=k.substring(5);I(j+g,a.substring(0,s),n,q);I(j+g+s,h,Q(k,h),q);I(j+g+v,a.substring(v),n,q)}else q.push(j+g,k)}r.d=q}return n}function x(b){var f=[],i=[];if(b.tripleQuotedStrings)f.push([A,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,
-    null,"'\""]);else b.multiLineStrings?f.push([A,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"]):f.push([A,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"]);b.verbatimStrings&&i.push([A,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null]);if(b.hashComments)if(b.cStyleComments){f.push([C,/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"]);i.push([A,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,
-    null])}else f.push([C,/^#[^\r\n]*/,null,"#"]);if(b.cStyleComments){i.push([C,/^\/\/[^\r\n]*/,null]);i.push([C,/^\/\*[\s\S]*?(?:\*\/|$)/,null])}b.regexLiterals&&i.push(["lang-regex",RegExp("^"+Z+"(/(?=[^/*])(?:[^/\\x5B\\x5C]|\\x5C[\\s\\S]|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+/)")]);b=b.keywords.replace(/^\s+|\s+$/g,"");b.length&&i.push([R,RegExp("^(?:"+b.replace(/\s+/g,"|")+")\\b"),null]);f.push([z,/^\s+/,null," \r\n\t\u00a0"]);i.push([J,/^@[a-z_$][a-z_$@0-9]*/i,null],[S,/^@?[A-Z]+[a-z][A-Za-z_$@0-9]*/,
-    null],[z,/^[a-z_$][a-z_$@0-9]*/i,null],[J,/^(?:0x[a-f0-9]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+\-]?\d+)?)[a-z]*/i,null,"0123456789"],[E,/^.[^\s\w\.$@\'\"\`\/\#]*/,null]);return B(f,i)}function $(b){function f(D){if(D>r){if(j&&j!==q){n.push("</span>");j=null}if(!j&&q){j=q;n.push('<span class="',j,'">')}var T=y(p(i.substring(r,D))).replace(e?d:c,"$1&#160;");e=k.test(T);n.push(T.replace(a,s));r=D}}var i=b.source,o=b.g,l=b.d,n=[],r=0,j=null,q=null,m=0,t=0,p=Y(window.PR_TAB_WIDTH),c=/([\r\n ]) /g,
-    d=/(^| ) /gm,a=/\r\n?|\n/g,k=/[ \r\n]$/,e=true,h=window._pr_isIE6();h=h?b.b.tagName==="PRE"?h===6?"&#160;\r\n":h===7?"&#160;<br>\r":"&#160;\r":"&#160;<br />":"<br />";var g=b.b.className.match(/\blinenums\b(?::(\d+))?/),s;if(g){for(var v=[],w=0;w<10;++w)v[w]=h+'</li><li class="L'+w+'">';var F=g[1]&&g[1].length?g[1]-1:0;n.push('<ol class="linenums"><li class="L',F%10,'"');F&&n.push(' value="',F+1,'"');n.push(">");s=function(){var D=v[++F%10];return j?"</span>"+D+'<span class="'+j+'">':D}}else s=h;
-    for(;;)if(m<o.length?t<l.length?o[m]<=l[t]:true:false){f(o[m]);if(j){n.push("</span>");j=null}n.push(o[m+1]);m+=2}else if(t<l.length){f(l[t]);q=l[t+1];t+=2}else break;f(i.length);j&&n.push("</span>");g&&n.push("</li></ol>");b.a=n.join("")}function u(b,f){for(var i=f.length;--i>=0;){var o=f[i];if(G.hasOwnProperty(o))"console"in window&&console.warn("cannot override language handler %s",o);else G[o]=b}}function Q(b,f){b&&G.hasOwnProperty(b)||(b=/^\s*</.test(f)?"default-markup":"default-code");return G[b]}
-    function U(b){var f=b.f,i=b.e;b.a=f;try{var o,l=f.match(aa);f=[];var n=0,r=[];if(l)for(var j=0,q=l.length;j<q;++j){var m=l[j];if(m.length>1&&m.charAt(0)==="<"){if(!ba.test(m))if(ca.test(m)){f.push(m.substring(9,m.length-3));n+=m.length-12}else if(da.test(m)){f.push("\n");++n}else if(m.indexOf(V)>=0&&m.replace(/\s(\w+)\s*=\s*(?:\"([^\"]*)\"|'([^\']*)'|(\S+))/g,' $1="$2$3$4"').match(/[cC][lL][aA][sS][sS]=\"[^\"]*\bnocode\b/)){var t=m.match(W)[2],p=1,c;c=j+1;a:for(;c<q;++c){var d=l[c].match(W);if(d&&
-    d[2]===t)if(d[1]==="/"){if(--p===0)break a}else++p}if(c<q){r.push(n,l.slice(j,c+1).join(""));j=c}else r.push(n,m)}else r.push(n,m)}else{var a;p=m;var k=p.indexOf("&");if(k<0)a=p;else{for(--k;(k=p.indexOf("&#",k+1))>=0;){var e=p.indexOf(";",k);if(e>=0){var h=p.substring(k+3,e),g=10;if(h&&h.charAt(0)==="x"){h=h.substring(1);g=16}var s=parseInt(h,g);isNaN(s)||(p=p.substring(0,k)+String.fromCharCode(s)+p.substring(e+1))}}a=p.replace(ea,"<").replace(fa,">").replace(ga,"'").replace(ha,'"').replace(ia," ").replace(ja,
-    "&")}f.push(a);n+=a.length}}o={source:f.join(""),h:r};var v=o.source;b.source=v;b.c=0;b.g=o.h;Q(i,v)(b);$(b)}catch(w){if("console"in window)console.log(w&&w.stack?w.stack:w)}}var A="str",R="kwd",C="com",S="typ",J="lit",E="pun",z="pln",P="src",V="nocode",Z=function(){for(var b=["!","!=","!==","#","%","%=","&","&&","&&=","&=","(","*","*=","+=",",","-=","->","/","/=",":","::",";","<","<<","<<=","<=","=","==","===",">",">=",">>",">>=",">>>",">>>=","?","@","[","^","^=","^^","^^=","{","|","|=","||","||=",
-    "~","break","case","continue","delete","do","else","finally","instanceof","return","throw","try","typeof"],f="(?:^^|[+-]",i=0;i<b.length;++i)f+="|"+b[i].replace(/([^=<>:&a-z])/g,"\\$1");f+=")\\s*";return f}(),L=/&/g,M=/</g,N=/>/g,X=/\"/g,ea=/&lt;/g,fa=/&gt;/g,ga=/&apos;/g,ha=/&quot;/g,ja=/&amp;/g,ia=/&nbsp;/g,ka=/[\r\n]/g,K=null,aa=RegExp("[^<]+|<!--[\\s\\S]*?--\>|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>|</?[a-zA-Z](?:[^>\"']|'[^']*'|\"[^\"]*\")*>|<","g"),ba=/^<\!--/,ca=/^<!\[CDATA\[/,da=/^<br\b/i,W=/^<(\/?)([a-zA-Z][a-zA-Z0-9]*)/,
-    la=x({keywords:"break continue do else for if return while auto case char const default double enum extern float goto int long register short signed sizeof static struct switch typedef union unsigned void volatile catch class delete false import new operator private protected public this throw true try typeof alignof align_union asm axiom bool concept concept_map const_cast constexpr decltype dynamic_cast explicit export friend inline late_check mutable namespace nullptr reinterpret_cast static_assert static_cast template typeid typename using virtual wchar_t where break continue do else for if return while auto case char const default double enum extern float goto int long register short signed sizeof static struct switch typedef union unsigned void volatile catch class delete false import new operator private protected public this throw true try typeof abstract boolean byte extends final finally implements import instanceof null native package strictfp super synchronized throws transient as base by checked decimal delegate descending event fixed foreach from group implicit in interface internal into is lock object out override orderby params partial readonly ref sbyte sealed stackalloc string select uint ulong unchecked unsafe ushort var break continue do else for if return while auto case char const default double enum extern float goto int long register short signed sizeof static struct switch typedef union unsigned void volatile catch class delete false import new operator private protected public this throw true try typeof debugger eval export function get null set undefined var with Infinity NaN caller delete die do dump elsif eval exit foreach for goto if import last local my next no our print package redo require sub undef unless until use wantarray while BEGIN END break continue do else for if return while and as assert class def del elif except exec finally from global import in is lambda nonlocal not or pass print raise try with yield False True None break continue do else for if return while alias and begin case class def defined elsif end ensure false in module next nil not or redo rescue retry self super then true undef unless until when yield BEGIN END break continue do else for if return while case done elif esac eval fi function in local set then until ",
-    hashComments:true,cStyleComments:true,multiLineStrings:true,regexLiterals:true}),G={};u(la,["default-code"]);u(B([],[[z,/^[^<?]+/],["dec",/^<!\w[^>]*(?:>|$)/],[C,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[E,/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup",
-    "htm","html","mxml","xhtml","xml","xsl"]);u(B([[z,/^[\s]+/,null," \t\r\n"],["atv",/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[E,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],
-    ["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]);u(B([],[["atv",/^[\s\S]+/]]),["uq.val"]);u(x({keywords:"break continue do else for if return while auto case char const default double enum extern float goto int long register short signed sizeof static struct switch typedef union unsigned void volatile catch class delete false import new operator private protected public this throw true try typeof alignof align_union asm axiom bool concept concept_map const_cast constexpr decltype dynamic_cast explicit export friend inline late_check mutable namespace nullptr reinterpret_cast static_assert static_cast template typeid typename using virtual wchar_t where ",
-    hashComments:true,cStyleComments:true}),["c","cc","cpp","cxx","cyc","m"]);u(x({keywords:"null true false"}),["json"]);u(x({keywords:"break continue do else for if return while auto case char const default double enum extern float goto int long register short signed sizeof static struct switch typedef union unsigned void volatile catch class delete false import new operator private protected public this throw true try typeof abstract boolean byte extends final finally implements import instanceof null native package strictfp super synchronized throws transient as base by checked decimal delegate descending event fixed foreach from group implicit in interface internal into is lock object out override orderby params partial readonly ref sbyte sealed stackalloc string select uint ulong unchecked unsafe ushort var ",
-    hashComments:true,cStyleComments:true,verbatimStrings:true}),["cs"]);u(x({keywords:"break continue do else for if return while auto case char const default double enum extern float goto int long register short signed sizeof static struct switch typedef union unsigned void volatile catch class delete false import new operator private protected public this throw true try typeof abstract boolean byte extends final finally implements import instanceof null native package strictfp super synchronized throws transient ",
-    cStyleComments:true}),["java"]);u(x({keywords:"break continue do else for if return while case done elif esac eval fi function in local set then until ",hashComments:true,multiLineStrings:true}),["bsh","csh","sh"]);u(x({keywords:"break continue do else for if return while and as assert class def del elif except exec finally from global import in is lambda nonlocal not or pass print raise try with yield False True None ",hashComments:true,multiLineStrings:true,tripleQuotedStrings:true}),["cv","py"]);
-    u(x({keywords:"caller delete die do dump elsif eval exit foreach for goto if import last local my next no our print package redo require sub undef unless until use wantarray while BEGIN END ",hashComments:true,multiLineStrings:true,regexLiterals:true}),["perl","pl","pm"]);u(x({keywords:"break continue do else for if return while alias and begin case class def defined elsif end ensure false in module next nil not or redo rescue retry self super then true undef unless until when yield BEGIN END ",hashComments:true,
-    multiLineStrings:true,regexLiterals:true}),["rb"]);u(x({keywords:"break continue do else for if return while auto case char const default double enum extern float goto int long register short signed sizeof static struct switch typedef union unsigned void volatile catch class delete false import new operator private protected public this throw true try typeof debugger eval export function get null set undefined var with Infinity NaN ",cStyleComments:true,regexLiterals:true}),["js"]);u(B([],[[A,/^[\s\S]+/]]),
-    ["regex"]);window.PR_normalizedHtml=H;window.prettyPrintOne=function(b,f){var i={f:b,e:f};U(i);return i.a};window.prettyPrint=function(b){function f(){for(var t=window.PR_SHOULD_USE_CONTINUATION?j.now()+250:Infinity;q<o.length&&j.now()<t;q++){var p=o[q];if(p.className&&p.className.indexOf("prettyprint")>=0){var c=p.className.match(/\blang-(\w+)\b/);if(c)c=c[1];for(var d=false,a=p.parentNode;a;a=a.parentNode)if((a.tagName==="pre"||a.tagName==="code"||a.tagName==="xmp")&&a.className&&a.className.indexOf("prettyprint")>=
-    0){d=true;break}if(!d){a=p;if(null===K){d=document.createElement("PRE");d.appendChild(document.createTextNode('<!DOCTYPE foo PUBLIC "foo bar">\n<foo />'));K=!/</.test(d.innerHTML)}if(K){d=a.innerHTML;if("XMP"===a.tagName)d=y(d);else{a=a;if("PRE"===a.tagName)a=true;else if(ka.test(d)){var k="";if(a.currentStyle)k=a.currentStyle.whiteSpace;else if(window.getComputedStyle)k=window.getComputedStyle(a,null).whiteSpace;a=!k||k==="pre"}else a=true;a||(d=d.replace(/(<br\s*\/?>)[\r\n]+/g,"$1").replace(/(?:[\r\n]+[ \t]*)+/g,
-    " "))}d=d}else{d=[];for(a=a.firstChild;a;a=a.nextSibling)H(a,d);d=d.join("")}d=d.replace(/(?:\r\n?|\n)$/,"");m={f:d,e:c,b:p};U(m);if(p=m.a){c=m.b;if("XMP"===c.tagName){d=document.createElement("PRE");for(a=0;a<c.attributes.length;++a){k=c.attributes[a];if(k.specified)if(k.name.toLowerCase()==="class")d.className=k.value;else d.setAttribute(k.name,k.value)}d.innerHTML=p;c.parentNode.replaceChild(d,c)}else c.innerHTML=p}}}}if(q<o.length)setTimeout(f,250);else b&&b()}for(var i=[document.getElementsByTagName("pre"),
-    document.getElementsByTagName("code"),document.getElementsByTagName("xmp")],o=[],l=0;l<i.length;++l)for(var n=0,r=i[l].length;n<r;++n)o.push(i[l][n]);i=null;var j=Date;j.now||(j={now:function(){return(new Date).getTime()}});var q=0,m;f()};window.PR={combinePrefixPatterns:O,createSimpleLexer:B,registerLangHandler:u,sourceDecorator:x,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:C,PR_DECLARATION:"dec",PR_KEYWORD:R,PR_LITERAL:J,PR_NOCODE:V,PR_PLAIN:z,PR_PUNCTUATION:E,PR_SOURCE:P,PR_STRING:A,
-    PR_TAG:"tag",PR_TYPE:S}})()
-
-    ;
-
-    // lang-sql.js
-    // http://code.google.com/p/google-code-prettify/
-
-    PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\r \xA0]+/,null,"\t\n\r \u00a0"],["str",/^(?:"(?:[^\"\\]|\\.)*"|'(?:[^\'\\]|\\.)*')/,null,"\"'"]],[["com",/^(?:--[^\r\n]*|\/\*[\s\S]*?(?:\*\/|$))/],["kwd",/^(?:ADD|ALL|ALTER|AND|ANY|AS|ASC|AUTHORIZATION|BACKUP|BEGIN|BETWEEN|BREAK|BROWSE|BULK|BY|CASCADE|CASE|CHECK|CHECKPOINT|CLOSE|CLUSTERED|COALESCE|COLLATE|COLUMN|COMMIT|COMPUTE|CONSTRAINT|CONTAINS|CONTAINSTABLE|CONTINUE|CONVERT|CREATE|CROSS|CURRENT|CURRENT_DATE|CURRENT_TIME|CURRENT_TIMESTAMP|CURRENT_USER|CURSOR|DATABASE|DBCC|DEALLOCATE|DECLARE|DEFAULT|DELETE|DENY|DESC|DISK|DISTINCT|DISTRIBUTED|DOUBLE|DROP|DUMMY|DUMP|ELSE|END|ERRLVL|ESCAPE|EXCEPT|EXEC|EXECUTE|EXISTS|EXIT|FETCH|FILE|FILLFACTOR|FOR|FOREIGN|FREETEXT|FREETEXTTABLE|FROM|FULL|FUNCTION|GOTO|GRANT|GROUP|HAVING|HOLDLOCK|IDENTITY|IDENTITYCOL|IDENTITY_INSERT|IF|IN|INDEX|INNER|INSERT|INTERSECT|INTO|IS|JOIN|KEY|KILL|LEFT|LIKE|LINENO|LOAD|NATIONAL|NOCHECK|NONCLUSTERED|NOT|NULL|NULLIF|OF|OFF|OFFSETS|ON|OPEN|OPENDATASOURCE|OPENQUERY|OPENROWSET|OPENXML|OPTION|OR|ORDER|OUTER|OVER|PERCENT|PLAN|PRECISION|PRIMARY|PRINT|PROC|PROCEDURE|PUBLIC|RAISERROR|READ|READTEXT|RECONFIGURE|REFERENCES|REPLICATION|RESTORE|RESTRICT|RETURN|REVOKE|RIGHT|ROLLBACK|ROWCOUNT|ROWGUIDCOL|RULE|SAVE|SCHEMA|SELECT|SESSION_USER|SET|SETUSER|SHUTDOWN|SOME|STATISTICS|SYSTEM_USER|TABLE|TEXTSIZE|THEN|TO|TOP|TRAN|TRANSACTION|TRIGGER|TRUNCATE|TSEQUAL|UNION|UNIQUE|UPDATE|UPDATETEXT|USE|USER|VALUES|VARYING|VIEW|WAITFOR|WHEN|WHERE|WHILE|WITH|WRITETEXT)(?=[^\w-]|$)/i,
-    null],["lit",/^[+-]?(?:0x[\da-f]+|(?:(?:\.\d+|\d+(?:\.\d*)?)(?:e[+\-]?\d+)?))/i],["pln",/^[a-z_][\w-]*/i],["pun",/^[^\w\t\n\r \xA0\"\'][^\w\t\n\r \xA0+\-\"\']*/]]),["sql"])
-
-    ;
-}
diff --git a/lib/rack-mini-profiler/lib/html/includes.less b/lib/rack-mini-profiler/lib/html/includes.less
deleted file mode 100644
index 34bf7151c..000000000
--- a/lib/rack-mini-profiler/lib/html/includes.less
+++ /dev/null
@@ -1,471 +0,0 @@
-.box-shadow(@dx, @dy, @radius, @color) {
-    -moz-box-shadow: @dx @dy @radius @color;
-    -webkit-box-shadow: @dx @dy @radius @color;
-    box-shadow: @dx @dy @radius @color;
-}
-
-@anchorColor: #0077CC;
-@buttonBorderColor: #888;
-@numberColor: #111;
-@textColor: #555;
-@mutedColor: #aaa;
-@normalFonts: Helvetica, Arial, sans-serif;
-@codeFonts: Consolas, monospace, serif;
-@zindex:2147483640; // near 32bit max 2147483647
-
-// do some resets
-.profiler-result, .profiler-queries {
-    color:#555;
-    line-height:1;
-    font-size:12px;
-
-    pre, code, label, table, tbody, thead, tfoot, tr, th, td {
-        margin:0;
-        padding:0;
-        border:0;
-        font-size:100%;
-        font:inherit;
-        vertical-align:baseline;
-        background-color:transparent;
-        overflow:visible;
-        max-height:none;
-    }
-    table {
-        border-collapse:collapse;
-        border-spacing:0;
-    }
-    a, a:hover {
-        cursor:pointer;
-        color:@anchorColor;
-    }
-    a {
-        text-decoration:none;
-        &:hover {
-            text-decoration:underline;
-        }
-    }
-}
-
-// styles shared between popup view and full view
-.profiler-result 
-{
-
-    .profiler-toggle-duration-with-children
-    {
-        float: right;
-    }
-    
-    table.profiler-client-timings
-    {
-        margin-top: 10px;
-    }
-    
-    font-family:@normalFonts;
-
-    .profiler-label {
-        color:@textColor;
-        overflow:hidden;
-        text-overflow: ellipsis;
-    }
-
-    .profiler-unit {
-        color:@mutedColor;
-    }
-
-    .profiler-trivial {
-        display:none;
-        td, td * {
-            color:@mutedColor !important;
-        }
-    }
-
-    pre, code, .profiler-number, .profiler-unit {
-        font-family:@codeFonts;
-    }
-
-    .profiler-number {
-        color:@numberColor;
-    }
-
-    .profiler-info {
-        text-align:right;
-        .profiler-name {
-            float:left;
-        }
-        .profiler-server-time {
-            white-space:nowrap;
-        }
-    }
-    
-    .profiler-timings {
-        th {
-            background-color:#fff;
-            color:@mutedColor;
-            text-align:right;
-        }
-        th, td {
-            white-space:nowrap;
-        }
-        .profiler-duration-with-children {
-            display:none;
-        }
-        .profiler-duration {
-            .profiler-number;
-            text-align:right;
-        }
-        .profiler-indent {
-            letter-spacing:4px;
-        }
-        .profiler-queries-show {
-            .profiler-number, .profiler-unit {
-                color:@anchorColor;
-            }
-        }
-        .profiler-queries-duration {
-            padding-left:6px;
-        }
-        .profiler-percent-in-sql {
-            white-space:nowrap;
-            text-align:right;
-        }
-
-        tfoot {
-            td {
-                padding-top:10px;
-                text-align:right;
-
-                a {
-                    font-size:95%;
-                    display:inline-block;
-                    margin-left:12px;
-
-                    &:first-child {
-                        float:left;
-                        margin-left:0px;
-                    }
-                    &.profiler-custom-link {
-                        float:left;
-                    }
-                }
-            }
-        }
-    }
-
-    .profiler-queries {
-        font-family:@normalFonts;
-
-        .profiler-stack-trace {
-            margin-bottom:15px;
-        }
-        pre {
-            font-family:@codeFonts;
-            white-space:pre-wrap;
-        }
-
-        th {
-            background-color:#fff;
-            border-bottom:1px solid #555;
-            font-weight:bold;
-            padding:15px;
-            white-space:nowrap;
-        }
-
-        td {
-            padding:15px;
-            text-align:left;
-            background-color:#fff;
-
-            &:last-child {
-                padding-right:25px; // compensate for scrollbars
-            }
-        }
-
-        .profiler-odd td {
-            background-color:#e5e5e5;
-        }
-
-        .profiler-since-start, .profiler-duration {
-            text-align:right;
-        }
-
-        .profiler-info div {
-            text-align:right;
-            margin-bottom:5px;
-        }
-
-        .profiler-gap-info, .profiler-gap-info td { background-color: #ccc;}
-        .profiler-gap-info  {
-            .profiler-unit {color: #777;}
-            .profiler-info {text-align: right}
-            &.profiler-trivial-gaps {display: none}
-        }
-
-        .profiler-trivial-gap-container { text-align: center;}
-
-        // prettify colors
-        .str{color:maroon}
-        .kwd{color:#00008b}
-        .com{color:gray}
-        .typ{color:#2b91af}
-        .lit{color:maroon}
-        .pun{color:#000}
-        .pln{color:#000}
-        .tag{color:maroon}
-        .atn{color:red}
-        .atv{color:blue}
-        .dec{color:purple}
-    }
-
-    .profiler-warning, .profiler-warning *, .profiler-warning .profiler-queries-show, .profiler-warning .profiler-queries-show .profiler-unit { // i'm no good at css
-        color:#f00;
-        &:hover {
-            color:#f00;
-        }
-    }
-
-    .profiler-nuclear {
-        .profiler-warning;
-        font-weight:bold;
-        padding-right:2px;
-    }
-}
-
-// ajaxed-in results will be appended to this
-.profiler-results 
-{
-    z-index:@zindex + 3;
-    position:fixed;
-    top:0px;
-
-    @radius:10px;
-
-    &.profiler-left {
-        left:0px;
-
-        &.profiler-no-controls .profiler-result:last-child .profiler-button, .profiler-controls {
-            -webkit-border-bottom-right-radius: @radius;
-            -moz-border-radius-bottomright: @radius;
-            border-bottom-right-radius: @radius;
-        }
-
-        .profiler-button, .profiler-controls {
-            border-right: 1px solid @buttonBorderColor;
-        }
-    }
-
-    &.profiler-right {
-        right:0px;
-
-        &.profiler-no-controls .profiler-result:last-child .profiler-button, .profiler-controls {
-            -webkit-border-bottom-left-radius: @radius;
-            -moz-border-radius-bottomleft: @radius;
-            border-bottom-left-radius: @radius;
-        }
-
-        .profiler-button, .profiler-controls {
-            border-left: 1px solid @buttonBorderColor;
-        }
-    }
-
-    .profiler-button, .profiler-controls {
-        display:none;
-        z-index:@zindex;
-        border-bottom: 1px solid @buttonBorderColor;
-        background-color:#fff;
-        padding: 4px 7px;
-        text-align:right;
-        cursor:pointer;
-
-        &.profiler-button-active {
-            background-color:maroon;
-
-            .profiler-number, .profiler-nuclear {
-                color:#fff;
-                font-weight:bold;
-            }
-            .profiler-unit {
-                color:#fff;
-                font-weight:normal;
-            }
-        }
-    }
-
-    .profiler-controls {
-        display: block;
-        font-size:12px;
-        font-family: @codeFonts;
-        cursor:default;
-        text-align: center;
-
-        span {
-            border-right: 1px solid @mutedColor;
-            padding-right: 5px;
-            margin-right: 5px;
-            cursor:pointer;
-        }
-
-        span:last-child {
-            border-right: none;
-        }
-    }
-
-    .profiler-popup {
-        display:none;
-        z-index:@zindex + 1;
-        position:absolute;
-        background-color:#fff;
-        border: 1px solid #aaa;
-        padding:5px 10px;
-        text-align:left;
-        line-height:18px;
-        overflow:auto;
-
-        .box-shadow(0px, 1px, 15px, #555);
-
-        .profiler-info {
-            margin-bottom:3px;
-            padding-bottom:2px;
-            border-bottom:1px solid #ddd;
-
-            .profiler-name {
-                font-size:110%;
-                font-weight:bold;
-                .profiler-overall-duration {
-                    display:none;
-                }
-            }
-            .profiler-server-time {
-                font-size:95%;
-            }
-        }
-
-        .profiler-timings {
-
-            th, td {
-                padding-left:6px;
-                padding-right:6px;
-            }
-
-            th {
-                font-size:95%;
-                padding-bottom:3px;
-            }
-
-            .profiler-label {
-                max-width:275px;
-            }
-        }
-    }
-
-    .profiler-queries {
-        display:none;
-        z-index:@zindex + 3;
-        position:absolute;
-        overflow-y:auto;
-        overflow-x:auto;
-        background-color:#fff;
-
-        th {
-            font-size:17px;
-        }
-    }
-
-    &.profiler-min .profiler-result {
-        display: none;
-    }
-
-    &.profiler-min .profiler-controls span {
-        display: none;
-    }
-
-    &.profiler-min .profiler-controls .profiler-min-max {
-        border-right: none;
-        padding: 0px;
-        margin: 0px;
-    }
-}
-
-// popup results' queries will be displayed in front of this
-.profiler-queries-bg {
-    z-index:@zindex + 2;
-    display:none;
-    background:#000;
-    opacity:0.7;
-    position:absolute;
-    top:0px;
-    left:0px;
-    min-width:100%;
-}
-
-// used when viewing a shared, full page result
-.profiler-result-full {
-    .profiler-result {
-
-        width:950px;
-        margin:30px auto;
-
-        .profiler-button {
-            display:none;
-        }
-
-        .profiler-popup {
-
-            .profiler-info {
-                font-size: 25px;
-                border-bottom:1px solid @mutedColor;
-                padding-bottom:3px;
-                margin-bottom:25px;
-
-                .profiler-overall-duration {
-                    padding-right:20px;
-                    font-size:80%;
-                    color:#888;
-                }
-            }
-
-            .profiler-timings {
-                td, th {
-                    padding-left:8px;
-                    padding-right:8px;
-                }
-                th {
-                    padding-bottom:7px;
-                }
-                td {
-                    font-size:14px;
-                    padding-bottom:4px;
-
-                    &:first-child {
-                        padding-left:10px;
-                    }
-                }
-
-                .profiler-label {
-                    max-width:550px;
-                }
-            }
-        }
-
-        .profiler-queries {
-            margin:25px 0;
-            table {
-                width:100%;
-            }
-            th {
-                font-size:16px;
-                color:#555;
-                line-height:20px;
-            }
-
-            td {
-                padding:15px 10px;
-                text-align:left;
-            }
-
-            .profiler-info div {
-                text-align:right;
-                margin-bottom:5px;
-            }
-        }
-    }
-}
diff --git a/lib/rack-mini-profiler/lib/html/includes.tmpl b/lib/rack-mini-profiler/lib/html/includes.tmpl
deleted file mode 100644
index e07c96823..000000000
--- a/lib/rack-mini-profiler/lib/html/includes.tmpl
+++ /dev/null
@@ -1,222 +0,0 @@
-<script id="profilerTemplate" type="text/x-jquery-tmpl">
-
-  <div class="profiler-result">
-
-    <div class="profiler-button {{if HasDuplicateSqlTimings}}profiler-warning{{/if}}">
-    {{if HasDuplicateSqlTimings}}<span class="profiler-nuclear">!</span>{{/if}}
-      <span class="profiler-number">
-        ${MiniProfiler.formatDuration(DurationMilliseconds)} <span class="profiler-unit">ms</span>
-      </span>
-    </div>
-
-    <div class="profiler-popup">
-      <div class="profiler-info">
-        <span class="profiler-name">
-          ${Name} <span class="profiler-overall-duration">(${MiniProfiler.formatDuration(DurationMilliseconds)} ms)</span>
-        </span>
-        <span class="profiler-server-time">${MachineName} on ${MiniProfiler.renderDate(Started)}</span>
-      </div>
-      <div class="profiler-output">
-        <table class="profiler-timings">
-          <thead>
-            <tr>
-              <th></th>
-              <th>duration (ms)</th>
-              <th class="profiler-duration-with-children">with children (ms)</th>
-              <th class="time-from-start">from start (ms)</th>
-            {{if HasSqlTimings}}
-              <th colspan="2">query time (ms)</th>
-            {{/if}}
-            {{each CustomTimingNames}}
-              <th colspan="2">${$value.toLowerCase()} (ms)</th>
-            {{/each}}
-            </tr>
-          </thead>
-          <tbody>
-            {{tmpl({timing:Root, page:this.data}) "#timingTemplate"}}
-          </tbody>
-          <tfoot>
-            <tr>
-              <td colspan="3">
-                {{if !ClientTimings}}
-                {{tmpl "#linksTemplate"}}
-                {{/if}}
-                <a class="profiler-toggle-duration-with-children" title="toggles column with aggregate child durations">show time with children</a>
-              </td>
-            {{if HasSqlTimings}}
-              <td colspan="2" class="profiler-number profiler-percent-in-sql" title="${MiniProfiler.getSqlTimingsCount(Root)} queries spent ${MiniProfiler.formatDuration(DurationMillisecondsInSql)} ms of total request time">
-                ${MiniProfiler.formatDuration(DurationMillisecondsInSql / DurationMilliseconds * 100)}
-                <span class="profiler-unit">% in sql</span>
-              </td>
-            {{/if}}
-            {{each CustomTimingNames}}
-              <td colspan="2" class="profiler-number profiler-percentage-in-sql" title="${CustomTimingStats[$value].Count} ${$value.toLowerCase()} invocations spent ${MiniProfiler.formatDuration(CustomTimingStats[$value].Duration)} ms of total request time">
-                ${MiniProfiler.formatDuration(CustomTimingStats[$value].Duration / DurationMilliseconds * 100)}
-                <span class="profiler-unit">% in ${$value.toLowerCase()}</span>
-              </td>
-            {{/each}}
-            </tr>
-          </tfoot>
-        </table>
-        {{if ClientTimings}}
-        <table class="profiler-timings profiler-client-timings">
-          <thead>
-            <tr>
-              <th>client event</th>
-              <th>duration (ms)</th>
-              <th>from start (ms)</th>
-            </tr>
-          </thead>
-          <tbody>
-            {{each MiniProfiler.getClientTimings(ClientTimings)}}
-            <tr class="{{if $value.isTrivial }}profiler-trivial{{/if}}">
-              <td class="profiler-label">${$value.name}</td>
-              <td class="profiler-duration">
-                {{if $value.duration >= 0}}
-                <span class="profiler-unit"></span>${MiniProfiler.formatDuration($value.duration)}
-                {{/if}}
-              </td>
-              <td class="profiler-duration time-from-start">
-                <span class="profiler-unit">+</span>${MiniProfiler.formatDuration($value.start)}
-              </td>
-            </tr>
-            {{/each}}
-          </tbody>
-          <tfoot>
-            <td colspan="3">
-              {{tmpl "#linksTemplate"}}
-            </td>
-          </tfoot>
-        </table>
-        {{/if}}
-      </div>
-    </div>
-
-  {{if HasSqlTimings}}
-    <div class="profiler-queries">
-      <table>
-      <thead>
-        <tr>
-          <th style="text-align:right">step<br />time from start<br />query type<br />duration</th>
-          <th style="text-align:left">call stack<br />query</th>
-        </tr>
-      </thead>
-      <tbody>
-        {{each(i, s) MiniProfiler.getSqlTimings(Root)}}
-          {{tmpl({ g:s.prevGap }) "#sqlGapTemplate"}}
-          {{tmpl({ i:i, s:s }) "#sqlTimingTemplate"}}
-          {{if s.nextGap}}
-            {{tmpl({ g:s.nextGap }) "#sqlGapTemplate"}}
-          {{/if}}
-        {{/each}}
-      </tbody>
-      </table>
-      <p class="profiler-trivial-gap-container">
-        <a class="profiler-toggle-trivial-gaps" href="#">show trivial gaps</a>
-      </p>
-    </div>
-  {{/if}}
-
-  </div>
-
-</script>
-
-<script id="linksTemplate" type="text/x-jquery-tmpl">
-  <a href="${MiniProfiler.shareUrl(Id)}" class="profiler-share-profiler-results" target="_blank">share</a>
-  {{if CustomLink}}
-  <a href="${CustomLink}" class="profiler-custom-link" target="_blank">${CustomLinkName}</a>
-  {{/if}}
-  {{if HasTrivialTimings}}
-  <a class="profiler-toggle-trivial" data-show-on-load="${HasAllTrivialTimings}" title="toggles any rows with &lt; ${TrivialDurationThresholdMilliseconds} ms">
-    show trivial
-  </a>
-  {{/if}}
-</script>
-
-<script id="timingTemplate" type="text/x-jquery-tmpl">
-
-  <tr class="{{if timing.IsTrivial }}profiler-trivial{{/if}}" data-timing-id="${timing.Id}">
-    <td class="profiler-label" title="{{if timing.Name && timing.Name.length > 45 }}${timing.Name}{{/if}}">
-      <span class="profiler-indent">${MiniProfiler.renderIndent(timing.Depth)}</span> ${timing.Name.slice(0,45)}{{if timing.Name && timing.Name.length > 45 }}...{{/if}}
-    </td>
-    <td class="profiler-duration" title="duration of this step without any children's durations">
-      ${MiniProfiler.formatDuration(timing.DurationWithoutChildrenMilliseconds)}
-    </td>
-    <td class="profiler-duration profiler-duration-with-children" title="duration of this step and its children">
-      ${MiniProfiler.formatDuration(timing.DurationMilliseconds)}
-    </td>
-    <td class="profiler-duration time-from-start" title="time elapsed since profiling started">
-      <span class="profiler-unit">+</span>${MiniProfiler.formatDuration(timing.StartMilliseconds)}
-    </td>
-
-  {{if timing.HasSqlTimings}}
-    <td class="profiler-duration {{if timing.HasDuplicateSqlTimings}}profiler-warning{{/if}}" title="{{if timing.HasDuplicateSqlTimings}}duplicate queries detected - {{/if}}{{if timing.ExecutedReaders > 0 || timing.ExecutedScalars > 0 || timing.ExecutedNonQueries > 0}}${timing.ExecutedReaders} reader, ${timing.ExecutedScalars} scalar, ${timing.ExecutedNonQueries} non-query statements executed{{/if}}">
-      <a class="profiler-queries-show">
-        {{if timing.HasDuplicateSqlTimings}}<span class="profiler-nuclear">!</span>{{/if}}
-        ${timing.SqlTimings.length} <span class="profiler-unit">sql</span>
-      </a>
-    </td>
-    <td class="profiler-duration" title="aggregate duration of all queries in this step (excludes children)">
-      ${MiniProfiler.formatDuration(timing.SqlTimingsDurationMilliseconds)}
-    </td>
-  {{else}}
-    <td colspan="2"></td>
-  {{/if}}
-
-  {{each page.CustomTimingNames}}
-    {{if timing.CustomTimings && timing.CustomTimings[$value]}}
-      <td class="profiler-duration" title="aggregate number of all ${$value.toLowerCase()} invocations in this step (excludes children)">
-        ${timing.CustomTimings[$value].length} ${$value.toLowerCase()}
-      </td>
-      <td class="profiler-duration" title="aggregate duration of all ${$value.toLowerCase()} invocations in this step (excludes children)">
-        ${MiniProfiler.formatDuration(timing.CustomTimingStats[$value].Duration)}
-      </td>
-    {{else}}
-      <td colspan="2"></td>
-    {{/if}}
-  {{/each}}
-
-  </tr>
-
-  {{if timing.HasChildren}}
-    {{each timing.Children}}
-      {{tmpl({timing: $value, page: page}) "#timingTemplate"}}
-    {{/each}}
-  {{/if}}
-
-</script>
-
-<script id="sqlTimingTemplate" type="text/x-jquery-tmpl">
-
-  <tr class="{{if i % 2 == 1}}profiler-odd{{/if}}" data-timing-id="${s.ParentTimingId}">
-    <td class="profiler-info">
-      <div>${s.ParentTimingName}</div>
-      <div class="profiler-number"><span class="profiler-unit">T+</span>${MiniProfiler.formatDuration(s.StartMilliseconds)} <span class="profiler-unit">ms</span></div>
-      <div>
-        {{if s.IsDuplicate}}<span class="profiler-warning">DUPLICATE</span>{{/if}}
-        ${MiniProfiler.renderExecuteType(s.ExecuteType)}
-      </div>
-      <div title="{{if s.ExecuteType == 3}}first result fetched: ${s.FirstFetchDurationMilliseconds}ms{{/if}}">${MiniProfiler.formatDuration(s.DurationMilliseconds)} <span class="profiler-unit">ms</span></div>
-    </td>
-    <td>
-      <div class="query">
-        <pre class="profiler-stack-trace">${s.StackTraceSnippet}</pre>
-        <pre class="prettyprint lang-sql"><code>${s.FormattedCommandString}   </code></pre>
-      </div>
-    </td>
-  </tr>
-
-</script>
-
-<script id="sqlGapTemplate" type="text/x-jquery-tmpl">
-
-  <tr class="profiler-gap-info{{if g.duration < 4}} profiler-trivial-gaps{{/if}}">
-    <td class="profiler-info">
-      ${g.duration} <span class="profiler-unit">ms</span>  
-    </td>
-    <td class="query">
-      <div>${g.topReason.name} &mdash; ${g.topReason.duration.toFixed(2)} <span class="profiler-unit">ms</span></div>
-    </td>
-  </tr>
-
-</script>
diff --git a/lib/rack-mini-profiler/lib/html/jquery.1.7.1.js b/lib/rack-mini-profiler/lib/html/jquery.1.7.1.js
deleted file mode 100644
index 2d323c72b..000000000
--- a/lib/rack-mini-profiler/lib/html/jquery.1.7.1.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v1.7.1 jquery.com | jquery.org/license */
-(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cb(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function ca(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bE.test(a)?d(a,e):ca(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)ca(a+"["+e+"]",b[e],c,d);else d(a,b)}function b_(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bT,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bP),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bC(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bx:by,g=0,h=e.length;if(d>0){if(c!=="border")for(;g<h;g++)c||(d-=parseFloat(f.css(a,"padding"+e[g]))||0),c==="margin"?d+=parseFloat(f.css(a,c+e[g]))||0:d-=parseFloat(f.css(a,"border"+e[g]+"Width"))||0;return d+"px"}d=bz(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0;if(c)for(;g<h;g++)d+=parseFloat(f.css(a,"padding"+e[g]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+e[g]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+e[g]))||0);return d+"px"}function bp(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p,q=c.createElement("div"),r=c.documentElement;q.setAttribute("className","t"),q.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="<div style='width:4px;'></div>",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h<g;h++)e=d[h],e&&(c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};
-f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=[],j,k,l,m,n,o,p,q,r,s,t;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click")){m=f(this),m.context=this.ownerDocument||this;for(l=c.target;l!=this;l=l.parentNode||this){o={},q=[],m[0]=l;for(j=0;j<e;j++)r=d[j],s=r.selector,o[s]===b&&(o[s]=r.quick?H(l,r.quick):m.is(s)),o[s]&&q.push(r);q.length&&i.push({elem:l,matches:q})}}d.length>e&&i.push({elem:this,matches:d.slice(e)});for(j=0;j<i.length&&!c.isPropagationStopped();j++){p=i[j],c.currentTarget=p.elem;for(k=0;k<p.matches.length&&!c.isImmediatePropagationStopped();k++){r=p.matches[k];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=((f.event.special[r.origType]||{}).handle||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.POS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function()
-{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bp)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bn(k[i]);else bn(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bq=/alpha\([^)]*\)/i,br=/opacity=([^)]*)/,bs=/([A-Z]|^ms)/g,bt=/^-?\d+(?:px)?$/i,bu=/^-?\d/,bv=/^([\-+])=([\-+.\de]+)/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bv.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bC(a,b,d);f.swap(a,bw,function(){e=bC(a,b,d)});return e}},set:function(a,b){if(!bt.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cv(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cn.test(h)?(o=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),o?(f._data(this,"toggle"+i,o==="show"?"hide":"show"),j[o]()):j[h]()):(k=co.exec(h),l=j.cur(),k?(m=parseFloat(k[2]),n=k[3]||(f.cssNumber[i]?"":"px"),n!=="px"&&(f.style(this,i,(m||1)+n),l=(m||1)/j.cur()*l,f.style(this,i,l+n)),k[1]&&(m=(k[1]==="-="?-1:1)*m+l),j.custom(l,m,n)):j.custom(l,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cr||cs(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){e.options.hide&&f._data(e.elem,"fxshow"+e.prop)===b&&f._data(e.elem,"fxshow"+e.prop,e.start)},h()&&f.timers.push(h)&&!cp&&(cp=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cr||cs(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cp),cp=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(["width","height"],function(a,b){f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.support.fixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.support.fixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
diff --git a/lib/rack-mini-profiler/lib/html/jquery.tmpl.js b/lib/rack-mini-profiler/lib/html/jquery.tmpl.js
deleted file mode 100644
index 8c9c4145f..000000000
--- a/lib/rack-mini-profiler/lib/html/jquery.tmpl.js
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
-* jQuery Templating Plugin
-* Copyright 2010, John Resig
-* Dual licensed under the MIT or GPL Version 2 licenses.
-*/
-(function (jQuery, undefined) {
-    var oldManip = jQuery.fn.domManip, tmplItmAtt = "_tmplitem", htmlExpr = /^[^<]*(<[\w\W]+>)[^>]*$|\{\{\! /,
-		newTmplItems = {}, wrappedItems = {}, appendToTmplItems, topTmplItem = { key: 0, data: {} }, itemKey = 0, cloneIndex = 0, stack = [];
-
-    function newTmplItem(options, parentItem, fn, data) {
-        // Returns a template item data structure for a new rendered instance of a template (a 'template item').
-        // The content field is a hierarchical array of strings and nested items (to be
-        // removed and replaced by nodes field of dom elements, once inserted in DOM).
-        var newItem = {
-            data: data || (parentItem ? parentItem.data : {}),
-            _wrap: parentItem ? parentItem._wrap : null,
-            tmpl: null,
-            parent: parentItem || null,
-            nodes: [],
-            calls: tiCalls,
-            nest: tiNest,
-            wrap: tiWrap,
-            html: tiHtml,
-            update: tiUpdate
-        };
-        if (options) {
-            jQuery.extend(newItem, options, { nodes: [], parent: parentItem });
-        }
-        if (fn) {
-            // Build the hierarchical content to be used during insertion into DOM
-            newItem.tmpl = fn;
-            newItem._ctnt = newItem._ctnt || newItem.tmpl(jQuery, newItem);
-            newItem.key = ++itemKey;
-            // Keep track of new template item, until it is stored as jQuery Data on DOM element
-            (stack.length ? wrappedItems : newTmplItems)[itemKey] = newItem;
-        }
-        return newItem;
-    }
-
-    // Override appendTo etc., in order to provide support for targeting multiple elements. (This code would disappear if integrated in jquery core).
-    jQuery.each({
-        appendTo: "append",
-        prependTo: "prepend",
-        insertBefore: "before",
-        insertAfter: "after",
-        replaceAll: "replaceWith"
-    }, function (name, original) {
-        jQuery.fn[name] = function (selector) {
-            var ret = [], insert = jQuery(selector), elems, i, l, tmplItems,
-				parent = this.length === 1 && this[0].parentNode;
-
-            appendToTmplItems = newTmplItems || {};
-            if (parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1) {
-                insert[original](this[0]);
-                ret = this;
-            } else {
-                for (i = 0, l = insert.length; i < l; i++) {
-                    cloneIndex = i;
-                    elems = (i > 0 ? this.clone(true) : this).get();
-                    jQuery.fn[original].apply(jQuery(insert[i]), elems);
-                    ret = ret.concat(elems);
-                }
-                cloneIndex = 0;
-                ret = this.pushStack(ret, name, insert.selector);
-            }
-            tmplItems = appendToTmplItems;
-            appendToTmplItems = null;
-            jQuery.tmpl.complete(tmplItems);
-            return ret;
-        };
-    });
-
-    jQuery.fn.extend({
-        // Use first wrapped element as template markup.
-        // Return wrapped set of template items, obtained by rendering template against data.
-        tmpl: function (data, options, parentItem) {
-            return jQuery.tmpl(this[0], data, options, parentItem);
-        },
-
-        // Find which rendered template item the first wrapped DOM element belongs to
-        tmplItem: function () {
-            return jQuery.tmplItem(this[0]);
-        },
-
-        // Consider the first wrapped element as a template declaration, and get the compiled template or store it as a named template.
-        template: function (name) {
-            return jQuery.template(name, this[0]);
-        },
-
-        domManip: function (args, table, callback, options) {
-            // This appears to be a bug in the appendTo, etc. implementation
-            // it should be doing .call() instead of .apply(). See #6227
-            if (args[0] && args[0].nodeType) {
-                var dmArgs = jQuery.makeArray(arguments), argsLength = args.length, i = 0, tmplItem;
-                while (i < argsLength && !(tmplItem = jQuery.data(args[i++], "tmplItem"))) { }
-                if (argsLength > 1) {
-                    dmArgs[0] = [jQuery.makeArray(args)];
-                }
-                if (tmplItem && cloneIndex) {
-                    dmArgs[2] = function (fragClone) {
-                        // Handler called by oldManip when rendered template has been inserted into DOM.
-                        jQuery.tmpl.afterManip(this, fragClone, callback);
-                    };
-                }
-                oldManip.apply(this, dmArgs);
-            } else {
-                oldManip.apply(this, arguments);
-            }
-            cloneIndex = 0;
-            if (!appendToTmplItems) {
-                jQuery.tmpl.complete(newTmplItems);
-            }
-            return this;
-        }
-    });
-
-    jQuery.extend({
-        // Return wrapped set of template items, obtained by rendering template against data.
-        tmpl: function (tmpl, data, options, parentItem) {
-            var ret, topLevel = !parentItem;
-            if (topLevel) {
-                // This is a top-level tmpl call (not from a nested template using {{tmpl}})
-                parentItem = topTmplItem;
-                tmpl = jQuery.template[tmpl] || jQuery.template(null, tmpl);
-                wrappedItems = {}; // Any wrapped items will be rebuilt, since this is top level
-            } else if (!tmpl) {
-                // The template item is already associated with DOM - this is a refresh.
-                // Re-evaluate rendered template for the parentItem
-                tmpl = parentItem.tmpl;
-                newTmplItems[parentItem.key] = parentItem;
-                parentItem.nodes = [];
-                if (parentItem.wrapped) {
-                    updateWrapped(parentItem, parentItem.wrapped);
-                }
-                // Rebuild, without creating a new template item
-                return jQuery(build(parentItem, null, parentItem.tmpl(jQuery, parentItem)));
-            }
-            if (!tmpl) {
-                return []; // Could throw...
-            }
-            if (typeof data === "function") {
-                data = data.call(parentItem || {});
-            }
-            if (options && options.wrapped) {
-                updateWrapped(options, options.wrapped);
-            }
-            ret = jQuery.isArray(data) ?
-				jQuery.map(data, function (dataItem) {
-				    return dataItem ? newTmplItem(options, parentItem, tmpl, dataItem) : null;
-				}) :
-				[newTmplItem(options, parentItem, tmpl, data)];
-            return topLevel ? jQuery(build(parentItem, null, ret)) : ret;
-        },
-
-        // Return rendered template item for an element.
-        tmplItem: function (elem) {
-            var tmplItem;
-            if (elem instanceof jQuery) {
-                elem = elem[0];
-            }
-            while (elem && elem.nodeType === 1 && !(tmplItem = jQuery.data(elem, "tmplItem")) && (elem = elem.parentNode)) { }
-            return tmplItem || topTmplItem;
-        },
-
-        // Set:
-        // Use $.template( name, tmpl ) to cache a named template,
-        // where tmpl is a template string, a script element or a jQuery instance wrapping a script element, etc.
-        // Use $( "selector" ).template( name ) to provide access by name to a script block template declaration.
-
-        // Get:
-        // Use $.template( name ) to access a cached template.
-        // Also $( selectorToScriptBlock ).template(), or $.template( null, templateString )
-        // will return the compiled template, without adding a name reference.
-        // If templateString includes at least one HTML tag, $.template( templateString ) is equivalent
-        // to $.template( null, templateString )
-        template: function (name, tmpl) {
-            if (tmpl) {
-                // Compile template and associate with name
-                if (typeof tmpl === "string") {
-                    // This is an HTML string being passed directly in.
-                    tmpl = buildTmplFn(tmpl)
-                } else if (tmpl instanceof jQuery) {
-                    tmpl = tmpl[0] || {};
-                }
-                if (tmpl.nodeType) {
-                    // If this is a template block, use cached copy, or generate tmpl function and cache.
-                    tmpl = jQuery.data(tmpl, "tmpl") || jQuery.data(tmpl, "tmpl", buildTmplFn(tmpl.innerHTML));
-                }
-                return typeof name === "string" ? (jQuery.template[name] = tmpl) : tmpl;
-            }
-            // Return named compiled template
-            return name ? (typeof name !== "string" ? jQuery.template(null, name) :
-				(jQuery.template[name] ||
-            // If not in map, treat as a selector. (If integrated with core, use quickExpr.exec) 
-					jQuery.template(null, htmlExpr.test(name) ? name : jQuery(name)))) : null;
-        },
-
-        encode: function (text) {
-            // Do HTML encoding replacing < > & and ' and " by corresponding entities.
-            return ("" + text).split("<").join("&lt;").split(">").join("&gt;").split('"').join("&#34;").split("'").join("&#39;");
-        }
-    });
-
-    jQuery.extend(jQuery.tmpl, {
-        tag: {
-            "tmpl": {
-                _default: { $2: "null" },
-                open: "if($notnull_1){_=_.concat($item.nest($1,$2));}"
-                // tmpl target parameter can be of type function, so use $1, not $1a (so not auto detection of functions)
-                // This means that {{tmpl foo}} treats foo as a template (which IS a function). 
-                // Explicit parens can be used if foo is a function that returns a template: {{tmpl foo()}}.
-            },
-            "wrap": {
-                _default: { $2: "null" },
-                open: "$item.calls(_,$1,$2);_=[];",
-                close: "call=$item.calls();_=call._.concat($item.wrap(call,_));"
-            },
-            "each": {
-                _default: { $2: "$index, $value" },
-                open: "if($notnull_1){$.each($1a,function($2){with(this){",
-                close: "}});}"
-            },
-            "if": {
-                open: "if(($notnull_1) && $1a){",
-                close: "}"
-            },
-            "else": {
-                _default: { $1: "true" },
-                open: "}else if(($notnull_1) && $1a){"
-            },
-            "html": {
-                // Unecoded expression evaluation. 
-                open: "if($notnull_1){_.push($1a);}"
-            },
-            "=": {
-                // Encoded expression evaluation. Abbreviated form is ${}.
-                _default: { $1: "$data" },
-                open: "if($notnull_1){_.push($.encode($1a));}"
-            },
-            "!": {
-                // Comment tag. Skipped by parser
-                open: ""
-            }
-        },
-
-        // This stub can be overridden, e.g. in jquery.tmplPlus for providing rendered events
-        complete: function (items) {
-            newTmplItems = {};
-        },
-
-        // Call this from code which overrides domManip, or equivalent
-        // Manage cloning/storing template items etc.
-        afterManip: function afterManip(elem, fragClone, callback) {
-            // Provides cloned fragment ready for fixup prior to and after insertion into DOM
-            var content = fragClone.nodeType === 11 ?
-				jQuery.makeArray(fragClone.childNodes) :
-				fragClone.nodeType === 1 ? [fragClone] : [];
-
-            // Return fragment to original caller (e.g. append) for DOM insertion
-            callback.call(elem, fragClone);
-
-            // Fragment has been inserted:- Add inserted nodes to tmplItem data structure. Replace inserted element annotations by jQuery.data.
-            storeTmplItems(content);
-            cloneIndex++;
-        }
-    });
-
-    //========================== Private helper functions, used by code above ==========================
-
-    function build(tmplItem, nested, content) {
-        // Convert hierarchical content into flat string array 
-        // and finally return array of fragments ready for DOM insertion
-        var frag, ret = content ? jQuery.map(content, function (item) {
-            return (typeof item === "string") ?
-            // Insert template item annotations, to be converted to jQuery.data( "tmplItem" ) when elems are inserted into DOM.
-				(tmplItem.key ? item.replace(/(<\w+)(?=[\s>])(?![^>]*_tmplitem)([^>]*)/g, "$1 " + tmplItmAtt + "=\"" + tmplItem.key + "\" $2") : item) :
-            // This is a child template item. Build nested template.
-				build(item, tmplItem, item._ctnt);
-        }) :
-        // If content is not defined, insert tmplItem directly. Not a template item. May be a string, or a string array, e.g. from {{html $item.html()}}. 
-		tmplItem;
-        if (nested) {
-            return ret;
-        }
-
-        // top-level template
-        ret = ret.join("");
-
-        // Support templates which have initial or final text nodes, or consist only of text
-        // Also support HTML entities within the HTML markup.
-        ret.replace(/^\s*([^<\s][^<]*)?(<[\w\W]+>)([^>]*[^>\s])?\s*$/, function (all, before, middle, after) {
-            frag = jQuery(middle).get();
-
-            storeTmplItems(frag);
-            if (before) {
-                frag = unencode(before).concat(frag);
-            }
-            if (after) {
-                frag = frag.concat(unencode(after));
-            }
-        });
-        return frag ? frag : unencode(ret);
-    }
-
-    function unencode(text) {
-        // Use createElement, since createTextNode will not render HTML entities correctly
-        var el = document.createElement("div");
-        el.innerHTML = text;
-        return jQuery.makeArray(el.childNodes);
-    }
-
-    // Generate a reusable function that will serve to render a template against data
-    function buildTmplFn(markup) {
-        return new Function("jQuery", "$item",
-			"var $=jQuery,call,_=[],$data=$item.data;" +
-
-        // Introduce the data as local variables using with(){}
-			"with($data){_.push('" +
-
-        // Convert the template into pure JavaScript
-			jQuery.trim(markup)
-				.replace(/([\\'])/g, "\\$1")
-				.replace(/[\r\t\n]/g, " ")
-				.replace(/\$\{([^\}]*)\}/g, "{{= $1}}")
-				.replace(/\{\{(\/?)(\w+|.)(?:\(((?:[^\}]|\}(?!\}))*?)?\))?(?:\s+(.*?)?)?(\(((?:[^\}]|\}(?!\}))*?)\))?\s*\}\}/g,
-				function (all, slash, type, fnargs, target, parens, args) {
-				    var tag = jQuery.tmpl.tag[type], def, expr, exprAutoFnDetect;
-				    if (!tag) {
-				        throw "Template command not found: " + type;
-				    }
-				    def = tag._default || [];
-				    if (parens && !/\w$/.test(target)) {
-				        target += parens;
-				        parens = "";
-				    }
-				    if (target) {
-				        target = unescape(target);
-				        args = args ? ("," + unescape(args) + ")") : (parens ? ")" : "");
-				        // Support for target being things like a.toLowerCase();
-				        // In that case don't call with template item as 'this' pointer. Just evaluate...
-				        expr = parens ? (target.indexOf(".") > -1 ? target + parens : ("(" + target + ").call($item" + args)) : target;
-				        exprAutoFnDetect = parens ? expr : "(typeof(" + target + ")==='function'?(" + target + ").call($item):(" + target + "))";
-				    } else {
-				        exprAutoFnDetect = expr = def.$1 || "null";
-				    }
-				    fnargs = unescape(fnargs);
-				    return "');" +
-						tag[slash ? "close" : "open"]
-							.split("$notnull_1").join(target ? "typeof(" + target + ")!=='undefined' && (" + target + ")!=null" : "true")
-							.split("$1a").join(exprAutoFnDetect)
-							.split("$1").join(expr)
-							.split("$2").join(fnargs ?
-								fnargs.replace(/\s*([^\(]+)\s*(\((.*?)\))?/g, function (all, name, parens, params) {
-								    params = params ? ("," + params + ")") : (parens ? ")" : "");
-								    return params ? ("(" + name + ").call($item" + params) : all;
-								})
-								: (def.$2 || "")
-							) +
-						"_.push('";
-				}) +
-			"');}return _;"
-		);
-    }
-    function updateWrapped(options, wrapped) {
-        // Build the wrapped content. 
-        options._wrap = build(options, true,
-        // Suport imperative scenario in which options.wrapped can be set to a selector or an HTML string.
-			jQuery.isArray(wrapped) ? wrapped : [htmlExpr.test(wrapped) ? wrapped : jQuery(wrapped).html()]
-		).join("");
-    }
-
-    function unescape(args) {
-        return args ? args.replace(/\\'/g, "'").replace(/\\\\/g, "\\") : null;
-    }
-    function outerHtml(elem) {
-        var div = document.createElement("div");
-        div.appendChild(elem.cloneNode(true));
-        return div.innerHTML;
-    }
-
-    // Store template items in jQuery.data(), ensuring a unique tmplItem data data structure for each rendered template instance.
-    function storeTmplItems(content) {
-        var keySuffix = "_" + cloneIndex, elem, elems, newClonedItems = {}, i, l, m;
-        for (i = 0, l = content.length; i < l; i++) {
-            if ((elem = content[i]).nodeType !== 1) {
-                continue;
-            }
-            elems = elem.getElementsByTagName("*");
-            for (m = elems.length - 1; m >= 0; m--) {
-                processItemKey(elems[m]);
-            }
-            processItemKey(elem);
-        }
-        function processItemKey(el) {
-            var pntKey, pntNode = el, pntItem, tmplItem, key;
-            // Ensure that each rendered template inserted into the DOM has its own template item,
-            if ((key = el.getAttribute(tmplItmAtt))) {
-                while (pntNode.parentNode && (pntNode = pntNode.parentNode).nodeType === 1 && !(pntKey = pntNode.getAttribute(tmplItmAtt))) { }
-                if (pntKey !== key) {
-                    // The next ancestor with a _tmplitem expando is on a different key than this one.
-                    // So this is a top-level element within this template item
-                    // Set pntNode to the key of the parentNode, or to 0 if pntNode.parentNode is null, or pntNode is a fragment.
-                    pntNode = pntNode.parentNode ? (pntNode.nodeType === 11 ? 0 : (pntNode.getAttribute(tmplItmAtt) || 0)) : 0;
-                    if (!(tmplItem = newTmplItems[key])) {
-                        // The item is for wrapped content, and was copied from the temporary parent wrappedItem.
-                        tmplItem = wrappedItems[key];
-                        tmplItem = newTmplItem(tmplItem, newTmplItems[pntNode] || wrappedItems[pntNode], null, true);
-                        tmplItem.key = ++itemKey;
-                        newTmplItems[itemKey] = tmplItem;
-                    }
-                    if (cloneIndex) {
-                        cloneTmplItem(key);
-                    }
-                }
-                el.removeAttribute(tmplItmAtt);
-            } else if (cloneIndex && (tmplItem = jQuery.data(el, "tmplItem"))) {
-                // This was a rendered element, cloned during append or appendTo etc.
-                // TmplItem stored in jQuery data has already been cloned in cloneCopyEvent. We must replace it with a fresh cloned tmplItem.
-                cloneTmplItem(tmplItem.key);
-                newTmplItems[tmplItem.key] = tmplItem;
-                pntNode = jQuery.data(el.parentNode, "tmplItem");
-                pntNode = pntNode ? pntNode.key : 0;
-            }
-            if (tmplItem) {
-                pntItem = tmplItem;
-                // Find the template item of the parent element. 
-                // (Using !=, not !==, since pntItem.key is number, and pntNode may be a string)
-                while (pntItem && pntItem.key != pntNode) {
-                    // Add this element as a top-level node for this rendered template item, as well as for any
-                    // ancestor items between this item and the item of its parent element
-                    pntItem.nodes.push(el);
-                    pntItem = pntItem.parent;
-                }
-                // Delete content built during rendering - reduce API surface area and memory use, and avoid exposing of stale data after rendering...
-                delete tmplItem._ctnt;
-                delete tmplItem._wrap;
-                // Store template item as jQuery data on the element
-                jQuery.data(el, "tmplItem", tmplItem);
-            }
-            function cloneTmplItem(key) {
-                key = key + keySuffix;
-                tmplItem = newClonedItems[key] =
-					(newClonedItems[key] || newTmplItem(tmplItem, newTmplItems[tmplItem.parent.key + keySuffix] || tmplItem.parent, null, true));
-            }
-        }
-    }
-
-    //---- Helper functions for template item ----
-
-    function tiCalls(content, tmpl, data, options) {
-        if (!content) {
-            return stack.pop();
-        }
-        stack.push({ _: content, tmpl: tmpl, item: this, data: data, options: options });
-    }
-
-    function tiNest(tmpl, data, options) {
-        // nested template, using {{tmpl}} tag
-        return jQuery.tmpl(jQuery.template(tmpl), data, options, this);
-    }
-
-    function tiWrap(call, wrapped) {
-        // nested template, using {{wrap}} tag
-        var options = call.options || {};
-        options.wrapped = wrapped;
-        // Apply the template, which may incorporate wrapped content, 
-        return jQuery.tmpl(jQuery.template(call.tmpl), call.data, options, call.item);
-    }
-
-    function tiHtml(filter, textOnly) {
-        var wrapped = this._wrap;
-        return jQuery.map(
-			jQuery(jQuery.isArray(wrapped) ? wrapped.join("") : wrapped).filter(filter || "*"),
-			function (e) {
-			    return textOnly ?
-					e.innerText || e.textContent :
-					e.outerHTML || outerHtml(e);
-			});
-    }
-
-    function tiUpdate() {
-        var coll = this.nodes;
-        jQuery.tmpl(null, null, null, this).insertBefore(coll[0]);
-        jQuery(coll).remove();
-    }
-})(MiniProfiler.jQuery);
diff --git a/lib/rack-mini-profiler/lib/html/list.css b/lib/rack-mini-profiler/lib/html/list.css
deleted file mode 100644
index 5eedc8424..000000000
--- a/lib/rack-mini-profiler/lib/html/list.css
+++ /dev/null
@@ -1,9 +0,0 @@
-tbody tr:nth-child(odd)    { background-color:#eee; }
-tbody tr:nth-child(even)    { background-color:#fff; }
-table { border: 0; border-spacing:0;}
-tr {border: 0;}
-.date {font-size: 11px; color: #666;}
-td {padding: 8px;}
-.time {text-align:center;}
-thead tr {background-color: #bbb; color: #444; font-size: 12px;}
-thead tr th { padding: 5px 15px;}
diff --git a/lib/rack-mini-profiler/lib/html/list.js b/lib/rack-mini-profiler/lib/html/list.js
deleted file mode 100644
index eaa80cacc..000000000
--- a/lib/rack-mini-profiler/lib/html/list.js
+++ /dev/null
@@ -1,38 +0,0 @@
-var MiniProfiler = MiniProfiler || {};
-MiniProfiler.list = {
-    init:
-        function (options) {
-            var $ = MiniProfiler.jQuery;
-            var opt = options || {};
-
-            var updateGrid = function (id) {
-                $.ajax({
-                    url: options.path + 'results-list',
-                    data: { "last-id": id },
-                    dataType: 'json',
-                    type: 'GET',
-                    success: function (data) {
-                        $('table tbody').append($("#rowTemplate").tmpl(data));
-                        var oldId = id;
-                        var oldData = data;
-                        setTimeout(function () {
-                            var newId = oldId;
-                            if (oldData.length > 0) {
-                                newId = oldData[oldData.length - 1].Id;
-                            }
-                            updateGrid(newId);
-                        }, 4000);
-                    }
-                });
-            }
-
-            MiniProfiler.path = options.path;
-            $.get(options.path + 'list.tmpl?v=' + options.version, function (data) {
-                if (data) {
-                    $('body').append(data);
-                    $('body').append($('#tableTemplate').tmpl());
-                    updateGrid();
-                }
-            });
-        }
-};
diff --git a/lib/rack-mini-profiler/lib/html/list.tmpl b/lib/rack-mini-profiler/lib/html/list.tmpl
deleted file mode 100644
index 6ab8a59ef..000000000
--- a/lib/rack-mini-profiler/lib/html/list.tmpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<script id="tableTemplate" type="text/x-jquery-tmpl">
-  <table>
-    <thead>
-      <tr>
-        <th>Name</th>
-        <th>Started</th>
-        <th>Sql Duration</th>
-        <th>Total Duration</th>
-        <th>Request Start</th>
-        <th>Response Start</th>
-        <th>Dom Complete</th>
-      </tr>
-    </thead>
-    <tbody>
-      
-    </tbody>
-  </table>
-</script>
-<script id="rowTemplate" type="text/x-jquery-tmpl">
-  <tr>
-    <td>
-      <a href="${MiniProfiler.path}results?id=${Id}">${Name}</a></td>
-    <td class="date">${MiniProfiler.renderDate(Started)}</td>
-    <td class="time">${DurationMillisecondsInSql}</td>
-    <td class="time">${DurationMilliseconds}</td>
-    {{if ClientTimings}}
-    <td class="time">${MiniProfiler.getClientTimingByName(ClientTimings,"Request").Start}</td>
-    <td class="time">${MiniProfiler.getClientTimingByName(ClientTimings,"Response").Start}</td>
-    <td class="time">${MiniProfiler.getClientTimingByName(ClientTimings,"Dom Complete").Start}</td>
-    {{else}}
-    <td colspan="3"></td>
-    {{/if}}
-  </tr>
-</script>
diff --git a/lib/rack-mini-profiler/lib/html/profile_handler.js b/lib/rack-mini-profiler/lib/html/profile_handler.js
deleted file mode 100644
index 4b8ade62d..000000000
--- a/lib/rack-mini-profiler/lib/html/profile_handler.js
+++ /dev/null
@@ -1 +0,0 @@
-<script async type="text/javascript" id="mini-profiler" src="{path}includes.js?v={version}" data-version="{version}" data-path="{path}" data-current-id="{currentId}" data-ids="{ids}" data-position="{position}" data-trivial="{showTrivial}" data-children="{showChildren}" data-max-traces="{maxTracesToShow}" data-controls="{showControls}" data-authorized="{authorized}" data-toggle-shortcut="{toggleShortcut}" data-start-hidden="{startHidden}"></script>
diff --git a/lib/rack-mini-profiler/lib/html/share.html b/lib/rack-mini-profiler/lib/html/share.html
deleted file mode 100644
index 88ea3859c..000000000
--- a/lib/rack-mini-profiler/lib/html/share.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-    <head>
-        <title>{name} ({duration} ms) - Profiling Results</title>
-        <script type='text/javascript' src='{path}jquery.1.7.1.js?v={version}'></script>
-        <script type='text/javascript'> var profiler = {json}; </script>
-        {includes} 
-    </head>
-    <body>
-        <div class='profiler-result-full'></div>
-    </body>
-</html>
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/client_settings.rb b/lib/rack-mini-profiler/lib/mini_profiler/client_settings.rb
deleted file mode 100644
index 402ed9364..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/client_settings.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-module Rack
-  class MiniProfiler
-    class ClientSettings
-
-      COOKIE_NAME = "__profilin"
-
-      BACKTRACE_DEFAULT = nil
-      BACKTRACE_FULL = 1
-      BACKTRACE_NONE = 2
-
-      attr_accessor :disable_profiling
-      attr_accessor :backtrace_level
-
-
-      def initialize(env)
-        request = ::Rack::Request.new(env)
-        @cookie = request.cookies[COOKIE_NAME]
-        if @cookie
-          @cookie.split(",").map{|pair| pair.split("=")}.each do |k,v|
-            @orig_disable_profiling = @disable_profiling = (v=='t') if k == "dp"
-            @backtrace_level = v.to_i if k == "bt"
-          end
-        end
-
-        @backtrace_level = nil if !@backtrace_level.nil? && (@backtrace_level == 0 || @backtrace_level > BACKTRACE_NONE)
-        @orig_backtrace_level = @backtrace_level
-
-      end
-
-      def write!(headers)
-        if @orig_disable_profiling != @disable_profiling || @orig_backtrace_level != @backtrace_level || @cookie.nil?
-          settings = {"p" =>  "t" }
-          settings["dp"] = "t" if @disable_profiling
-          settings["bt"] = @backtrace_level if @backtrace_level
-          settings_string = settings.map{|k,v| "#{k}=#{v}"}.join(",")
-          Rack::Utils.set_cookie_header!(headers, COOKIE_NAME, :value => settings_string, :path => '/')
-        end
-      end
-
-      def discard_cookie!(headers)
-        Rack::Utils.delete_cookie_header!(headers, COOKIE_NAME, :path => '/')
-      end
-
-      def has_cookie?
-        !@cookie.nil?
-      end
-
-      def disable_profiling?
-        @disable_profiling
-      end
-
-      def backtrace_full?
-        @backtrace_level == BACKTRACE_FULL
-      end
-
-      def backtrace_default?
-        @backtrace_level == BACKTRACE_DEFAULT
-      end
-
-      def backtrace_none?
-        @backtrace_level == BACKTRACE_NONE
-      end
-    end
-  end
-end
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/client_timer_struct.rb b/lib/rack-mini-profiler/lib/mini_profiler/client_timer_struct.rb
deleted file mode 100644
index 3d3c83518..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/client_timer_struct.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-require 'mini_profiler/timer_struct'
-
-module Rack
-  class MiniProfiler
-
-    # This class holds the client timings
-    class ClientTimerStruct < TimerStruct
-
-      def self.init_instrumentation
-        "<script type=\"text/javascript\">mPt=function(){var t=[];return{t:t,probe:function(n){t.push({d:new Date(),n:n})}}}()</script>"
-      end
-      
-      def self.instrument(name,orig)
-        probe = "<script>mPt.probe('#{name}')</script>"
-        wrapped = probe
-        wrapped << orig 
-        wrapped << probe 
-        wrapped
-      end
-
-
-      def initialize(env={})
-        super
-      end
-
-      def self.init_from_form_data(env, page_struct)
-        timings = []
-        clientTimes, clientPerf, baseTime = nil 
-        form = env['rack.request.form_hash']
-
-        clientPerf = form['clientPerformance'] if form 
-        clientTimes = clientPerf['timing'] if clientPerf 
-
-        baseTime = clientTimes['navigationStart'].to_i if clientTimes
-        return unless clientTimes && baseTime 
-
-        probes = form['clientProbes']
-        translated = {}
-        if probes && !["null", ""].include?(probes)
-          probes.each do |id, val|
-            name = val["n"]
-            translated[name] ||= {} 
-            if translated[name][:start]
-              translated[name][:finish] = val["d"]
-            else 
-              translated[name][:start] = val["d"]
-            end
-          end
-        end
-
-        translated.each do |name, data|
-          h = {"Name" => name, "Start" => data[:start].to_i - baseTime}
-          h["Duration"] = data[:finish].to_i - data[:start].to_i if data[:finish]
-          timings.push(h)
-        end
-
-        clientTimes.keys.find_all{|k| k =~ /Start$/ }.each do |k|
-          start = clientTimes[k].to_i - baseTime 
-          finish = clientTimes[k.sub(/Start$/, "End")].to_i - baseTime
-          duration = 0 
-          duration = finish - start if finish > start 
-          name = k.sub(/Start$/, "").split(/(?=[A-Z])/).map{|s| s.capitalize}.join(' ')
-          timings.push({"Name" => name, "Start" => start, "Duration" => duration}) if start >= 0
-        end
-
-        clientTimes.keys.find_all{|k| !(k =~ /(End|Start)$/)}.each do |k|
-          timings.push("Name" => k, "Start" => clientTimes[k].to_i - baseTime, "Duration" => -1)
-        end
-
-        rval = self.new
-        rval['RedirectCount'] = env['rack.request.form_hash']['clientPerformance']['navigation']['redirectCount']
-        rval['Timings'] = timings
-        rval
-      end
-    end
-
-  end
-end
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/config.rb b/lib/rack-mini-profiler/lib/mini_profiler/config.rb
deleted file mode 100644
index c976c4ea9..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/config.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-module Rack
-  class MiniProfiler
-    class Config
-
-    def self.attr_accessor(*vars)
-      @attributes ||= []
-      @attributes.concat vars
-      super(*vars)
-    end
-
-    def self.attributes
-      @attributes
-    end
-
-    attr_accessor :authorization_mode, :auto_inject, :backtrace_ignores, :backtrace_includes, :backtrace_remove,
-      :backtrace_threshold_ms, :base_url_path, :enabled, :flamegraph_sample_rate, :logger, :position,
-      :pre_authorize_cb, :skip_paths, :skip_schema_queries, :start_hidden, :storage, :storage_failure,
-      :storage_instance, :storage_options, :toggle_shortcut, :user_provider
-
-    # Deprecated options
-    attr_accessor :use_existing_jquery
-
-      def self.default
-        new.instance_eval {
-          @auto_inject = true # automatically inject on every html page
-          @base_url_path = "/mini-profiler-resources/"
-
-          # called prior to rack chain, to ensure we are allowed to profile
-          @pre_authorize_cb = lambda {|env| true}
-
-          # called after rack chain, to ensure we are REALLY allowed to profile
-          @position = 'left'  # Where it is displayed
-          @skip_schema_queries = false
-          @storage = MiniProfiler::MemoryStore
-          @user_provider = Proc.new{|env| Rack::Request.new(env).ip}
-          @authorization_mode = :allow_all
-          @toggle_shortcut = 'Alt+P'
-          @start_hidden = false
-          @backtrace_threshold_ms = 0
-          @flamegraph_sample_rate = 0.5
-          @storage_failure = Proc.new do |exception|
-            if @logger
-              @logger.warn("MiniProfiler storage failure: #{exception.message}")
-            end
-          end
-          @enabled = true
-          self
-        }
-      end
-
-      def merge!(config)
-        return unless config
-        if Hash === config
-          config.each{|k,v| instance_variable_set "@#{k}",v}
-        else
-          self.class.attributes.each{ |k|
-            v = config.send k
-            instance_variable_set "@#{k}", v if v
-          }
-        end
-      end
-
-    end
-  end
-end
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/context.rb b/lib/rack-mini-profiler/lib/mini_profiler/context.rb
deleted file mode 100644
index 8a81f5307..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/context.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class Rack::MiniProfiler::Context
-  attr_accessor :inject_js,:current_timer,:page_struct,:skip_backtrace,:full_backtrace,:discard, :mpt_init, :measure
-
-  def initialize(opts = {})
-    opts["measure"] = true unless opts.key? "measure"
-    opts.each do |k,v|
-      self.instance_variable_set('@' + k, v)
-    end
-  end
-
-end
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/custom_timer_struct.rb b/lib/rack-mini-profiler/lib/mini_profiler/custom_timer_struct.rb
deleted file mode 100644
index b0ecaead8..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/custom_timer_struct.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'mini_profiler/timer_struct'
-
-module Rack
-  class MiniProfiler
-
-    # Timing system for a custom timers such as cache, redis, RPC, external API
-    # calls, etc.
-    class CustomTimerStruct < TimerStruct
-      def initialize(type, duration_ms, page, parent)
-        @parent = parent
-        @page = page
-        @type = type
-
-        super("Type" => type,
-              "StartMilliseconds" => ((Time.now.to_f * 1000).to_i - page['Started']) - duration_ms,
-              "DurationMilliseconds" => duration_ms,
-              "ParentTimingId" => nil)
-      end
-    end
-
-  end
-end
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/gc_profiler.rb b/lib/rack-mini-profiler/lib/mini_profiler/gc_profiler.rb
deleted file mode 100644
index 099c20b3f..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/gc_profiler.rb
+++ /dev/null
@@ -1,181 +0,0 @@
-class Rack::MiniProfiler::GCProfiler
-
-  def initialize
-    @ignore = []
-    @ignore << @ignore.__id__
-  end
-
-  def object_space_stats
-    stats = {}
-    ids = {}
-
-    @ignore << stats.__id__
-    @ignore << ids.__id__
-
-    i=0
-    ObjectSpace.each_object { |o|
-      begin
-        i = stats[o.class] || 0
-        i += 1
-        stats[o.class] = i
-        ids[o.__id__] = o if Integer === o.__id__
-      rescue NoMethodError
-        # protect against BasicObject
-      end
-    }
-
-    @ignore.each do |id|
-      if ids.delete(id)
-        klass = ObjectSpace._id2ref(id).class
-        stats[klass] -= 1
-      end
-    end
-
-    result = {:stats => stats, :ids => ids}
-    @ignore << result.__id__
-
-    result
-  end
-
-  def diff_object_stats(before,after)
-    diff = {}
-    after.each do |k,v|
-      diff[k] = v - (before[k] || 0)
-    end
-    before.each do |k,v|
-      diff[k] = 0 - v unless after[k]
-    end
-
-    diff
-  end
-
-  def analyze_strings(ids_before,ids_after)
-    result = {}
-    ids_after.each do |id,_|
-      obj = ObjectSpace._id2ref(id)
-      if String === obj && !ids_before.include?(obj.object_id)
-        result[obj] ||= 0
-        result[obj] += 1
-      end
-    end
-    result
-  end
-
-  def analyze_growth(ids_before, ids_after)
-    new_objects = 0
-    memory_allocated = 0
-
-    ids_after.each do |id,_|
-      if !ids_before.include?(id) && obj=ObjectSpace._id2ref(id)
-        # this is going to be version specific (may change in 2.1)
-        size = ObjectSpace.memsize_of(obj)
-        memory_allocated += size
-        new_objects += 1
-      end
-    end
-
-    [new_objects, memory_allocated]
-  end
-
-  def analyze_initial_state(ids_before)
-    memory_allocated = 0
-    objects = 0
-
-    ids_before.each do |id,_|
-      if obj=ObjectSpace._id2ref(id)
-        # this is going to be version specific (may change in 2.1)
-        memory_allocated += ObjectSpace.memsize_of(obj)
-        objects += 1
-      end
-    end
-
-    [objects,memory_allocated]
-  end
-
-  def profile_gc_time(app,env)
-    body = []
-
-    begin
-      GC::Profiler.clear
-      prev_profiler_state = GC::Profiler.enabled?
-      prev_gc_state = GC.enable
-      GC::Profiler.enable
-      b = app.call(env)[2]
-      b.close if b.respond_to? :close
-      body << "GC Profiler ran during this request, if it fired you will see the cost below:\n\n"
-      body << GC::Profiler.result
-    ensure
-      prev_gc_state ? GC.disable : GC.enable
-      GC::Profiler.disable unless prev_profiler_state
-    end
-
-    return [200, {'Content-Type' => 'text/plain'}, body]
-  end
-
-  def profile_gc(app,env)
-
-    # for memsize_of
-    require 'objspace'
-
-    body = [];
-
-    stat_before,stat_after,diff,string_analysis,
-      new_objects, memory_allocated, stat, memory_before, objects_before = nil
-
-    # clean up before
-    GC.start
-    stat = GC.stat
-    prev_gc_state = GC.disable
-    stat_before = object_space_stats
-    b = app.call(env)[2]
-    b.close if b.respond_to? :close
-    stat_after = object_space_stats
-    # so we don't blow out on memory
-    prev_gc_state ? GC.disable : GC.enable
-
-    diff = diff_object_stats(stat_before[:stats],stat_after[:stats])
-    string_analysis = analyze_strings(stat_before[:ids], stat_after[:ids])
-    new_objects, memory_allocated = analyze_growth(stat_before[:ids], stat_after[:ids])
-    objects_before, memory_before = analyze_initial_state(stat_before[:ids])
-
-
-    body << "
-Overview
-------------------------------------
-Initial state: object count - #{objects_before} , memory allocated outside heap (bytes) #{memory_before}
-
-GC Stats: #{stat.map{|k,v| "#{k} : #{v}" }.join(", ")}
-
-New bytes allocated outside of Ruby heaps: #{memory_allocated}
-New objects: #{new_objects}
-"
-
-    body << "
-ObjectSpace delta caused by request:
---------------------------------------------\n"
-    diff.to_a.reject{|k,v| v == 0}.sort{|x,y| y[1] <=> x[1]}.each do |k,v|
-      body << "#{k} : #{v}\n" if v != 0
-    end
-
-    body << "\n
-ObjectSpace stats:
------------------\n"
-
-    stat_after[:stats].to_a.sort{|x,y| y[1] <=> x[1]}.each do |k,v|
-      body << "#{k} : #{v}\n"
-    end
-
-
-    body << "\n
-String stats:
-------------\n"
-
-    string_analysis.to_a.sort{|x,y| y[1] <=> x[1] }.take(1000).each do |string,count|
-      body << "#{count} : #{string}\n"
-    end
-
-    return [200, {'Content-Type' => 'text/plain'}, body]
-  ensure
-    prev_gc_state ? GC.disable : GC.enable
-  end
-end
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/page_timer_struct.rb b/lib/rack-mini-profiler/lib/mini_profiler/page_timer_struct.rb
deleted file mode 100644
index 066293394..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/page_timer_struct.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'mini_profiler/timer_struct'
-
-module Rack
-  class MiniProfiler
-
-    # PageTimerStruct
-    #   Root: RequestTimer
-    #     :has_many RequestTimer children
-    #     :has_many SqlTimer children
-    #     :has_many CustomTimer children
-    class PageTimerStruct < TimerStruct
-      def initialize(env)
-        super("Id" => MiniProfiler.generate_id,
-              "Name" => env['PATH_INFO'],
-              "Started" => (Time.now.to_f * 1000).to_i,
-              "MachineName" => env['SERVER_NAME'],
-              "Level" => 0,
-              "User" => "unknown user",
-              "HasUserViewed" => false,
-              "ClientTimings" => nil,
-              "DurationMilliseconds" => 0,
-              "HasTrivialTimings" => true,
-              "HasAllTrivialTimigs" => false,
-              "TrivialDurationThresholdMilliseconds" => 2,
-              "Head" => nil,
-              "DurationMillisecondsInSql" => 0,
-              "HasSqlTimings" => true,
-              "HasDuplicateSqlTimings" => false,
-              "ExecutedReaders" => 0,
-              "ExecutedScalars" => 0,
-              "ExecutedNonQueries" => 0,
-              "CustomTimingNames" => [],
-              "CustomTimingStats" => {}
-             )
-        name = "#{env['REQUEST_METHOD']} http://#{env['SERVER_NAME']}:#{env['SERVER_PORT']}#{env['SCRIPT_NAME']}#{env['PATH_INFO']}"
-        self['Root'] = RequestTimerStruct.createRoot(name, self)
-      end
-
-      def duration_ms
-        @attributes['Root']['DurationMilliseconds']
-      end
-
-      def root
-        @attributes['Root']
-      end
-
-      def to_json(*a)
-        attribs = @attributes.merge(
-          "Started" => '/Date(%d)/' % @attributes['Started'],
-          "DurationMilliseconds" => @attributes['Root']['DurationMilliseconds'],
-          "CustomTimingNames" => @attributes['CustomTimingStats'].keys.sort
-        )
-        ::JSON.generate(attribs, :max_nesting => 100)
-      end
-    end
-
-  end
-end
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/profiler.rb b/lib/rack-mini-profiler/lib/mini_profiler/profiler.rb
deleted file mode 100644
index 4865615b6..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/profiler.rb
+++ /dev/null
@@ -1,567 +0,0 @@
-require 'json'
-require 'timeout'
-require 'thread'
-
-require 'mini_profiler/version'
-require 'mini_profiler/page_timer_struct'
-require 'mini_profiler/sql_timer_struct'
-require 'mini_profiler/custom_timer_struct'
-require 'mini_profiler/client_timer_struct'
-require 'mini_profiler/request_timer_struct'
-require 'mini_profiler/storage/abstract_store'
-require 'mini_profiler/storage/memcache_store'
-require 'mini_profiler/storage/memory_store'
-require 'mini_profiler/storage/redis_store'
-require 'mini_profiler/storage/file_store'
-require 'mini_profiler/config'
-require 'mini_profiler/profiling_methods'
-require 'mini_profiler/context'
-require 'mini_profiler/client_settings'
-require 'mini_profiler/gc_profiler'
-# TODO
-# require 'mini_profiler/gc_profiler_ruby_head' if Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION)
-
-module Rack
-
-  class MiniProfiler
-
-    class << self
-
-      include Rack::MiniProfiler::ProfilingMethods
-
-      def generate_id
-        rand(36**20).to_s(36)
-      end
-
-      def reset_config
-        @config = Config.default
-      end
-
-      # So we can change the configuration if we want
-      def config
-        @config ||= Config.default
-      end
-
-      def share_template
-        return @share_template unless @share_template.nil?
-        @share_template = ::File.read(::File.expand_path("../html/share.html", ::File.dirname(__FILE__)))
-      end
-
-      def current
-        Thread.current[:mini_profiler_private]
-      end
-
-      def current=(c)
-        # we use TLS cause we need access to this from sql blocks and code blocks that have no access to env
-        Thread.current[:mini_profiler_private]= c
-      end
-
-      # discard existing results, don't track this request
-      def discard_results
-        self.current.discard = true if current
-      end
-
-      def create_current(env={}, options={})
-        # profiling the request
-        self.current = Context.new
-        self.current.inject_js = config.auto_inject && (!env['HTTP_X_REQUESTED_WITH'].eql? 'XMLHttpRequest')
-        self.current.page_struct = PageTimerStruct.new(env)
-        self.current.current_timer = current.page_struct['Root']
-      end
-
-      def authorize_request
-        Thread.current[:mp_authorized] = true
-      end
-
-      def deauthorize_request
-        Thread.current[:mp_authorized] = nil
-      end
-
-      def request_authorized?
-        Thread.current[:mp_authorized]
-      end
-
-    end
-
-    #
-    # options:
-    # :auto_inject - should script be automatically injected on every html page (not xhr)
-    def initialize(app, config = nil)
-      MiniProfiler.config.merge!(config)
-      @config = MiniProfiler.config
-      @app = app
-      @config.base_url_path << "/" unless @config.base_url_path.end_with? "/"
-      unless @config.storage_instance
-        @config.storage_instance = @config.storage.new(@config.storage_options)
-      end
-      @storage = @config.storage_instance
-    end
-
-    def user(env)
-      @config.user_provider.call(env)
-    end
-
-    def serve_results(env)
-      request = Rack::Request.new(env)
-      id = request['id']
-      page_struct = @storage.load(id)
-      unless page_struct
-        @storage.set_viewed(user(env), id)
-        id = ERB::Util.html_escape(request['id'])
-        user_info = ERB::Util.html_escape(user(env))
-        return [404, {}, ["Request not found: #{id} - user #{user_info}"]]
-      end
-      unless page_struct['HasUserViewed']
-        page_struct['ClientTimings'] = ClientTimerStruct.init_from_form_data(env, page_struct)
-        page_struct['HasUserViewed'] = true
-        @storage.save(page_struct)
-        @storage.set_viewed(user(env), id)
-      end
-
-      result_json = page_struct.to_json
-      # If we're an XMLHttpRequest, serve up the contents as JSON
-      if request.xhr?
-        [200, { 'Content-Type' => 'application/json'}, [result_json]]
-      else
-
-        # Otherwise give the HTML back
-        html = MiniProfiler.share_template.dup
-        html.gsub!(/\{path\}/, "#{env['SCRIPT_NAME']}#{@config.base_url_path}")
-        html.gsub!(/\{version\}/, MiniProfiler::VERSION)
-        html.gsub!(/\{json\}/, result_json)
-        html.gsub!(/\{includes\}/, get_profile_script(env))
-        html.gsub!(/\{name\}/, page_struct['Name'])
-        html.gsub!(/\{duration\}/, "%.1f" % page_struct.duration_ms)
-
-        [200, {'Content-Type' => 'text/html'}, [html]]
-      end
-
-    end
-
-    def serve_html(env)
-      file_name = env['PATH_INFO'][(@config.base_url_path.length)..1000]
-
-      return serve_results(env) if file_name.eql?('results')
-
-      full_path = ::File.expand_path("../html/#{file_name}", ::File.dirname(__FILE__))
-      return [404, {}, ["Not found"]] unless ::File.exists? full_path
-      f = Rack::File.new nil
-      f.path = full_path
-
-      begin
-        f.cache_control = "max-age:86400"
-        f.serving env
-      rescue
-        # old versions of rack have a different api
-        status, headers, body = f.serving
-        headers.merge! 'Cache-Control' => "max-age:86400"
-        [status, headers, body]
-      end
-
-    end
-
-
-    def current
-      MiniProfiler.current
-    end
-
-    def current=(c)
-      MiniProfiler.current=c
-    end
-
-
-    def config
-      @config
-    end
-
-
-    def call(env)
-
-      client_settings = ClientSettings.new(env)
-
-      status = headers = body = nil
-      query_string = env['QUERY_STRING']
-      path = env['PATH_INFO']
-
-      skip_it = (@config.pre_authorize_cb && !@config.pre_authorize_cb.call(env)) ||
-                (@config.skip_paths && @config.skip_paths.any?{ |p| path[0,p.length] == p}) ||
-                query_string =~ /pp=skip/
-
-      has_profiling_cookie = client_settings.has_cookie?
-
-      if skip_it || (@config.authorization_mode == :whitelist && !has_profiling_cookie)
-        status,headers,body = @app.call(env)
-        if !skip_it && @config.authorization_mode == :whitelist && !has_profiling_cookie && MiniProfiler.request_authorized?
-          client_settings.write!(headers)
-        end
-        return [status,headers,body]
-      end
-
-      # handle all /mini-profiler requests here
-      return serve_html(env) if path.start_with? @config.base_url_path
-
-      has_disable_cookie = client_settings.disable_profiling?
-      # manual session disable / enable
-      if query_string =~ /pp=disable/ || has_disable_cookie
-        skip_it = true
-      end
-
-      if query_string =~ /pp=enable/ && (@config.authorization_mode != :whitelist || MiniProfiler.request_authorized?)
-        skip_it = false
-        config.enabled = true
-      end
-
-      if skip_it || !config.enabled
-        status,headers,body = @app.call(env)
-        client_settings.disable_profiling = true
-        client_settings.write!(headers)
-        return [status,headers,body]
-      else
-        client_settings.disable_profiling = false
-      end
-
-      if query_string =~ /pp=profile-gc/
-        current.measure = false if current
-
-        if query_string =~ /pp=profile-gc-time/
-          return Rack::MiniProfiler::GCProfiler.new.profile_gc_time(@app, env)
-        elsif query_string =~ /pp=profile-gc-ruby-head/
-          result = StringIO.new
-          report = MemoryProfiler.report do
-            _,_,body = @app.call(env)
-            body.close if body.respond_to? :close
-          end
-          report.pretty_print(result)
-          return text_result(result.string)
-        else
-          return Rack::MiniProfiler::GCProfiler.new.profile_gc(@app, env)
-        end
-      end
-
-      MiniProfiler.create_current(env, @config)
-      MiniProfiler.deauthorize_request if @config.authorization_mode == :whitelist
-
-      if query_string =~ /pp=normal-backtrace/
-        client_settings.backtrace_level = ClientSettings::BACKTRACE_DEFAULT
-      elsif query_string =~ /pp=no-backtrace/
-        current.skip_backtrace = true
-        client_settings.backtrace_level = ClientSettings::BACKTRACE_NONE
-      elsif query_string =~ /pp=full-backtrace/ || client_settings.backtrace_full?
-        current.full_backtrace = true
-        client_settings.backtrace_level = ClientSettings::BACKTRACE_FULL
-      elsif client_settings.backtrace_none?
-        current.skip_backtrace = true
-      end
-
-      flamegraph = nil
-
-      trace_exceptions = query_string =~ /pp=trace-exceptions/ && defined? TracePoint
-      status, headers, body, exceptions,trace = nil
-
-      start = Time.now
-
-      if trace_exceptions
-        exceptions = []
-        trace = TracePoint.new(:raise) do |tp|
-          exceptions << tp.raised_exception
-        end
-        trace.enable
-      end
-
-      begin
-
-        # Strip all the caching headers so we don't get 304s back
-        #  This solves a very annoying bug where rack mini profiler never shows up
-        env['HTTP_IF_MODIFIED_SINCE'] = ''
-        env['HTTP_IF_NONE_MATCH'] = ''
-
-        if query_string =~ /pp=flamegraph/
-          unless defined?(Flamegraph) && Flamegraph.respond_to?(:generate)
-
-            flamegraph = "Please install the flamegraph gem and require it: add gem 'flamegraph' to your Gemfile"
-            status,headers,body = @app.call(env)
-          else
-            # do not sully our profile with mini profiler timings
-            current.measure = false
-            match_data = query_string.match(/flamegraph_sample_rate=([\d\.]+)/)
-
-            mode = query_string =~ /mode=c/ ? :c : :ruby
-
-            if match_data && !match_data[1].to_f.zero?
-              sample_rate = match_data[1].to_f
-            else
-              sample_rate = config.flamegraph_sample_rate
-            end
-            flamegraph = Flamegraph.generate(nil, :fidelity => sample_rate, :embed_resources => query_string =~ /embed/, :mode => mode) do
-              status,headers,body = @app.call(env)
-            end
-          end
-        else
-          status,headers,body = @app.call(env)
-        end
-        client_settings.write!(headers)
-      ensure
-        trace.disable if trace
-      end
-
-      skip_it = current.discard
-
-      if (config.authorization_mode == :whitelist && !MiniProfiler.request_authorized?)
-        # this is non-obvious, don't kill the profiling cookie on errors or short requests
-        # this ensures that stuff that never reaches the rails stack does not kill profiling
-        if status == 200 && ((Time.now - start) > 0.1)
-          client_settings.discard_cookie!(headers)
-        end
-        skip_it = true
-      end
-
-      return [status,headers,body] if skip_it
-
-      # we must do this here, otherwise current[:discard] is not being properly treated
-      if trace_exceptions
-        body.close if body.respond_to? :close
-        return dump_exceptions exceptions
-      end
-
-      if query_string =~ /pp=env/
-        body.close if body.respond_to? :close
-        return dump_env env
-      end
-
-      if query_string =~ /pp=help/
-        body.close if body.respond_to? :close
-        return help(client_settings)
-      end
-
-      page_struct = current.page_struct
-      page_struct['User'] = user(env)
-      page_struct['Root'].record_time((Time.now - start) * 1000)
-
-      if flamegraph
-        body.close if body.respond_to? :close
-        return self.flamegraph(flamegraph)
-      end
-
-
-      begin
-        # no matter what it is, it should be unviewed, otherwise we will miss POST
-        @storage.set_unviewed(page_struct['User'], page_struct['Id'])
-        @storage.save(page_struct)
-
-        # inject headers, script
-        if headers['Content-Type'] && status == 200
-          client_settings.write!(headers)
-          result = inject_profiler(env,status,headers,body)
-          return result if result
-        end
-      rescue Exception => e
-        if @config.storage_failure != nil
-          @config.storage_failure.call(e)
-        end
-      end
-
-      client_settings.write!(headers)
-      [status, headers, body]
-
-    ensure
-      # Make sure this always happens
-      self.current = nil
-    end
-
-    def inject_profiler(env,status,headers,body)
-      # mini profiler is meddling with stuff, we can not cache cause we will get incorrect data
-      # Rack::ETag has already inserted some nonesense in the chain
-      content_type = headers['Content-Type']
-
-      headers.delete('ETag')
-      headers.delete('Date')
-      headers['Cache-Control'] = 'no-store, must-revalidate, private, max-age=0'
-
-      # inject header
-      if headers.is_a? Hash
-        headers['X-MiniProfiler-Ids'] = ids_json(env)
-      end
-
-      if current.inject_js && content_type =~ /text\/html/
-        response = Rack::Response.new([], status, headers)
-        script = self.get_profile_script(env)
-
-        if String === body
-          response.write inject(body,script)
-        else
-          body.each { |fragment| response.write inject(fragment, script) }
-        end
-        body.close if body.respond_to? :close
-        response.finish
-      else
-        nil
-      end
-    end
-
-    def inject(fragment, script)
-      if fragment.match(/<\/body>/i)
-        # explicit </body>
-
-        regex = /<\/body>/i
-        close_tag = '</body>'
-      elsif fragment.match(/<\/html>/i)
-        # implicit </body>
-
-        regex = /<\/html>/i
-        close_tag = '</html>'
-      else
-        # implicit </body> and </html>. Don't do anything.
-
-        return fragment
-      end
-
-      matches = fragment.scan(regex).length
-      index = 1
-      fragment.gsub(regex) do
-        # though malformed there is an edge case where /body exists earlier in the html, work around
-        if index < matches
-          index += 1
-          close_tag
-        else
-
-          # if for whatever crazy reason we dont get a utf string,
-          #   just force the encoding, no utf in the mp scripts anyway
-          if script.respond_to?(:encoding) && script.respond_to?(:force_encoding)
-            (script + close_tag).force_encoding(fragment.encoding)
-          else
-            script + close_tag
-          end
-        end
-      end
-    end
-
-    def dump_exceptions(exceptions)
-      headers = {'Content-Type' => 'text/plain'}
-      body = "Exceptions (#{exceptions.length} raised during request)\n\n"
-      exceptions.each do |e|
-        body << "#{e.class} #{e.message}\n#{e.backtrace.join("\n")}\n\n\n\n"
-      end
-
-      [200, headers, [body]]
-    end
-
-    def dump_env(env)
-      body = "Rack Environment\n---------------\n"
-      env.each do |k,v|
-        body << "#{k}: #{v}\n"
-      end
-
-      body << "\n\nEnvironment\n---------------\n"
-      ENV.each do |k,v|
-        body << "#{k}: #{v}\n"
-      end
-
-      body << "\n\nRuby Version\n---------------\n"
-      body << "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL}\n"
-
-      body << "\n\nInternals\n---------------\n"
-      body << "Storage Provider #{config.storage_instance}\n"
-      body << "User #{user(env)}\n"
-      body << config.storage_instance.diagnostics(user(env)) rescue "no diagnostics implemented for storage"
-
-      text_result(body)
-    end
-
-    def text_result(body)
-      headers = {'Content-Type' => 'text/plain'}
-      [200, headers, [body]]
-    end
-
-    def help(client_settings)
-      headers = {'Content-Type' => 'text/plain'}
-      body = "Append the following to your query string:
-
-  pp=help : display this screen
-  pp=env : display the rack environment
-  pp=skip : skip mini profiler for this request
-  pp=no-backtrace #{"(*) " if client_settings.backtrace_none?}: don't collect stack traces from all the SQL executed (sticky, use pp=normal-backtrace to enable)
-  pp=normal-backtrace #{"(*) " if client_settings.backtrace_default?}: collect stack traces from all the SQL executed and filter normally
-  pp=full-backtrace #{"(*) " if client_settings.backtrace_full?}: enable full backtraces for SQL executed (use pp=normal-backtrace to disable)
-  pp=disable : disable profiling for this session
-  pp=enable : enable profiling for this session (if previously disabled)
-  pp=profile-gc: perform gc profiling on this request, analyzes ObjectSpace generated by request (ruby 1.9.3 only)
-  pp=profile-gc-time: perform built-in gc profiling on this request (ruby 1.9.3 only)
-  pp=profile-gc-ruby-head: requires the memory_profiler gem, new location based report
-  pp=flamegraph: works best on Ruby 2.0, a graph representing sampled activity (requires the flamegraph gem).
-  pp=flamegraph&flamegraph_sample_rate=1: creates a flamegraph with the specified sample rate (in ms). Overrides value set in config
-  pp=flamegraph_embed: works best on Ruby 2.0, a graph representing sampled activity (requires the flamegraph gem), embedded resources for use on an intranet.
-  pp=trace-exceptions: requires Ruby 2.0, will return all the spots where your application raises execptions
-"
-
-      client_settings.write!(headers)
-      [200, headers, [body]]
-    end
-
-    def flamegraph(graph)
-      headers = {'Content-Type' => 'text/html'}
-      [200, headers, [graph]]
-    end
-
-    def ids(env)
-      # cap at 10 ids, otherwise there is a chance you can blow the header
-      ([current.page_struct["Id"]] + (@storage.get_unviewed_ids(user(env)) || [])[0..8]).uniq
-    end
-
-    def ids_json(env)
-      ::JSON.generate(ids(env))
-    end
-
-    def ids_comma_separated(env)
-      ids(env).join(",")
-    end
-
-    # get_profile_script returns script to be injected inside current html page
-    # By default, profile_script is appended to the end of all html requests automatically.
-    # Calling get_profile_script cancels automatic append for the current page
-    # Use it when:
-    # * you have disabled auto append behaviour throught :auto_inject => false flag
-    # * you do not want script to be automatically appended for the current page. You can also call cancel_auto_inject
-    def get_profile_script(env)
-
-      settings = {
-       :path => "#{env['SCRIPT_NAME']}#{@config.base_url_path}",
-       :version => MiniProfiler::VERSION,
-       :position => @config.position,
-       :showTrivial => false,
-       :showChildren => false,
-       :maxTracesToShow => 10,
-       :showControls => false,
-       :authorized => true,
-       :toggleShortcut => @config.toggle_shortcut,
-       :startHidden => @config.start_hidden
-      }
-
-      if current && current.page_struct
-        settings[:ids] = ids_comma_separated(env)
-        settings[:currentId] = current.page_struct["Id"]
-      else
-        settings[:ids] = []
-        settings[:currentId] = ""
-      end
-
-      # TODO : cache this snippet
-      script = IO.read(::File.expand_path('../html/profile_handler.js', ::File.dirname(__FILE__)))
-      # replace the variables
-      settings.each do |k,v|
-        regex = Regexp.new("\\{#{k.to_s}\\}")
-        script.gsub!(regex, v.to_s)
-      end
-
-      current.inject_js = false if current
-      script
-    end
-
-    # cancels automatic injection of profile script for the current page
-    def cancel_auto_inject(env)
-      current.inject_js = false
-    end
-
-  end
-
-end
-
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/profiling_methods.rb b/lib/rack-mini-profiler/lib/mini_profiler/profiling_methods.rb
deleted file mode 100644
index f0e2f3594..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/profiling_methods.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-module Rack
-  class MiniProfiler
-    module ProfilingMethods
-
-      def record_sql(query, elapsed_ms)
-        c = current
-        return unless c
-        c.current_timer.add_sql(query, elapsed_ms, c.page_struct, c.skip_backtrace, c.full_backtrace) if (c && c.current_timer)
-      end
-
-      def start_step(name)
-        if current
-          parent_timer = current.current_timer
-          current.current_timer = current_timer = current.current_timer.add_child(name)
-          [current_timer,parent_timer]
-        end
-      end
-
-      def finish_step(obj)
-        if obj && current
-          current_timer, parent_timer = obj
-          current_timer.record_time
-          current.current_timer = parent_timer
-        end
-      end
-
-      # perform a profiling step on given block
-      def step(name, opts = nil)
-        if current
-          parent_timer = current.current_timer
-          result = nil
-          current.current_timer = current_timer = current.current_timer.add_child(name)
-          begin
-            result = yield if block_given?
-          ensure
-            current_timer.record_time
-            current.current_timer = parent_timer
-          end
-        else
-          yield if block_given?
-        end
-      end
-
-      def unprofile_method(klass, method)
-
-        clean = clean_method_name(method)
-
-        with_profiling = ("#{clean}_with_mini_profiler").intern
-        without_profiling = ("#{clean}_without_mini_profiler").intern
-
-        if klass.send :method_defined?, with_profiling
-          klass.send :alias_method, method, without_profiling
-          klass.send :remove_method, with_profiling
-          klass.send :remove_method, without_profiling
-        end
-      end
-
-      def counter_method(klass, method, &blk)
-        self.profile_method(klass, method, :counter, &blk)
-      end
-
-      def uncounter_method(klass, method)
-        self.unprofile_method(klass, method)
-      end
-
-      def profile_method(klass, method, type = :profile, &blk)
-        default_name = type==:counter ? method.to_s  : klass.to_s + " " + method.to_s
-        clean = clean_method_name(method)
-
-        with_profiling =  ("#{clean}_with_mini_profiler").intern
-        without_profiling = ("#{clean}_without_mini_profiler").intern
-
-        if klass.send :method_defined?, with_profiling
-          return # dont double profile
-        end
-
-        klass.send :alias_method, without_profiling, method
-        klass.send :define_method, with_profiling do |*args, &orig|
-          return self.send without_profiling, *args, &orig unless Rack::MiniProfiler.current
-
-          name = default_name
-          if blk
-            name =
-              if respond_to?(:instance_exec)
-                instance_exec(*args, &blk)
-              else
-                # deprecated in Rails 4.x
-                blk.bind(self).call(*args)
-              end
-          end
-
-          result = nil
-          parent_timer = Rack::MiniProfiler.current.current_timer
-
-          if type == :counter
-            start = Time.now
-            begin
-              result = self.send without_profiling, *args, &orig
-            ensure
-              duration_ms = (Time.now - start).to_f * 1000
-              parent_timer.add_custom(name, duration_ms, Rack::MiniProfiler.current.page_struct )
-            end
-          else
-            page_struct = Rack::MiniProfiler.current.page_struct
-
-            Rack::MiniProfiler.current.current_timer = current_timer = parent_timer.add_child(name)
-            begin
-              result = self.send without_profiling, *args, &orig
-            ensure
-              current_timer.record_time
-              Rack::MiniProfiler.current.current_timer = parent_timer
-            end
-          end
-
-          result
-        end
-        klass.send :alias_method, method, with_profiling
-      end
-
-      # Add a custom timing. These are displayed similar to SQL/query time in
-      # columns expanding to the right.
-      #
-      # type        - String counter type. Each distinct type gets its own column.
-      # duration_ms - Duration of the call in ms. Either this or a block must be
-      #               given but not both.
-      #
-      # When a block is given, calculate the duration by yielding to the block
-      # and keeping a record of its run time.
-      #
-      # Returns the result of the block, or nil when no block is given.
-      def counter(type, duration_ms=nil)
-        result = nil
-        if block_given?
-          start = Time.now
-          result = yield
-          duration_ms = (Time.now - start).to_f * 1000
-        end
-        return result if current.nil? || !request_authorized?
-        current.current_timer.add_custom(type, duration_ms, current.page_struct)
-        result
-      end
-
-      private
-
-      def clean_method_name(method)
-        method.to_s.gsub(/[\?\!]/, "")
-      end
-
-    end
-  end
-end
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/request_timer_struct.rb b/lib/rack-mini-profiler/lib/mini_profiler/request_timer_struct.rb
deleted file mode 100644
index e8948b095..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/request_timer_struct.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-require 'mini_profiler/timer_struct'
-
-module Rack
-  class MiniProfiler
-
-    class RequestTimerStruct < TimerStruct
-
-      def self.createRoot(name, page)
-        rt = RequestTimerStruct.new(name, page, nil)
-        rt["IsRoot"]= true
-        rt
-      end
-
-      attr_accessor :children_duration
-
-      def initialize(name, page, parent)
-        super("Id" => MiniProfiler.generate_id,
-              "Name" => name,
-              "DurationMilliseconds" => 0,
-              "DurationWithoutChildrenMilliseconds"=> 0,
-              "StartMilliseconds" => (Time.now.to_f * 1000).to_i - page['Started'],
-              "ParentTimingId" => nil,
-              "Children" => [],
-              "HasChildren"=> false,
-              "KeyValues" => nil,
-              "HasSqlTimings"=> false,
-              "HasDuplicateSqlTimings"=> false,
-              "TrivialDurationThresholdMilliseconds" => 2,
-              "SqlTimings" => [],
-              "SqlTimingsDurationMilliseconds"=> 0,
-              "IsTrivial"=> false,
-              "IsRoot"=> false,
-              "Depth"=> parent ? parent.depth + 1 : 0,
-              "ExecutedReaders"=> 0,
-              "ExecutedScalars"=> 0,
-              "ExecutedNonQueries"=> 0,
-              "CustomTimingStats" => {},
-              "CustomTimings" => {})
-        @children_duration = 0
-        @start = Time.now
-        @parent = parent
-        @page = page
-      end
-
-      def duration_ms
-        self['DurationMilliseconds']
-      end
-
-      def start_ms
-        self['StartMilliseconds']
-      end
-
-      def start
-        @start
-      end
-
-      def depth
-        self['Depth']
-      end
-
-      def children
-        self['Children']
-      end
-
-      def add_child(name)
-        request_timer =  RequestTimerStruct.new(name, @page, self)
-        self['Children'].push(request_timer)
-        self['HasChildren'] = true
-        request_timer['ParentTimingId'] = self['Id']
-        request_timer['Depth'] = self['Depth'] + 1
-        request_timer
-      end
-
-      def add_sql(query, elapsed_ms, page, skip_backtrace = false, full_backtrace = false)
-        timer = SqlTimerStruct.new(query, elapsed_ms, page, self , skip_backtrace, full_backtrace)
-        timer['ParentTimingId'] = self['Id']
-        self['SqlTimings'].push(timer)
-        self['HasSqlTimings'] = true
-        self['SqlTimingsDurationMilliseconds'] += elapsed_ms
-        page['DurationMillisecondsInSql'] += elapsed_ms
-        timer
-      end
-
-      def add_custom(type, elapsed_ms, page)
-        timer = CustomTimerStruct.new(type, elapsed_ms, page, self)
-        timer['ParentTimingId'] = self['Id']
-        self['CustomTimings'][type] ||= []
-        self['CustomTimings'][type].push(timer)
-
-        self['CustomTimingStats'][type] ||= {"Count" => 0, "Duration" => 0.0}
-        self['CustomTimingStats'][type]['Count'] += 1
-        self['CustomTimingStats'][type]['Duration'] += elapsed_ms
-
-        page['CustomTimingStats'][type] ||= {"Count" => 0, "Duration" => 0.0}
-        page['CustomTimingStats'][type]['Count'] += 1
-        page['CustomTimingStats'][type]['Duration'] += elapsed_ms
-
-        timer
-      end
-
-      def record_time(milliseconds = nil)
-        milliseconds ||= (Time.now - @start) * 1000
-        self['DurationMilliseconds'] = milliseconds
-        self['IsTrivial'] = true if milliseconds < self["TrivialDurationThresholdMilliseconds"]
-        self['DurationWithoutChildrenMilliseconds'] = milliseconds - @children_duration
-
-        if @parent
-          @parent.children_duration += milliseconds
-        end
-
-      end
-    end
-  end
-
-end
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/sql_timer_struct.rb b/lib/rack-mini-profiler/lib/mini_profiler/sql_timer_struct.rb
deleted file mode 100644
index 074d34b58..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/sql_timer_struct.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'mini_profiler/timer_struct'
-
-module Rack
-  class MiniProfiler
-
-    # Timing system for a SQL query
-    class SqlTimerStruct < TimerStruct
-      def initialize(query, duration_ms, page, parent, skip_backtrace = false, full_backtrace = false)
-
-        stack_trace = nil 
-        unless skip_backtrace || duration_ms < Rack::MiniProfiler.config.backtrace_threshold_ms
-          # Allow us to filter the stack trace
-          stack_trace = ""
-           # Clean up the stack trace if there are options to do so
-          Kernel.caller.each do |ln|
-            ln.gsub!(Rack::MiniProfiler.config.backtrace_remove, '') if Rack::MiniProfiler.config.backtrace_remove and !full_backtrace
-            if    full_backtrace or 
-                  (
-                    (
-                      Rack::MiniProfiler.config.backtrace_includes.nil? or 
-                      Rack::MiniProfiler.config.backtrace_includes.all?{|regex| ln =~ regex}
-                    ) and
-                    (
-                      Rack::MiniProfiler.config.backtrace_ignores.nil? or 
-                      Rack::MiniProfiler.config.backtrace_ignores.all?{|regex| !(ln =~ regex)}
-                    )
-                  ) 
-              stack_trace << ln << "\n" 
-            end
-          end
-        end
-
-        @parent = parent
-        @page = page
-
-        super("ExecuteType" => 3, # TODO
-              "FormattedCommandString" => query,
-              "StackTraceSnippet" => stack_trace, 
-              "StartMilliseconds" => ((Time.now.to_f * 1000).to_i - page['Started']) - duration_ms,
-              "DurationMilliseconds" => duration_ms,
-              "FirstFetchDurationMilliseconds" => duration_ms,
-              "Parameters" => nil,
-              "ParentTimingId" => nil,
-              "IsDuplicate" => false)
-      end
-
-      def report_reader_duration(elapsed_ms)
-        return if @reported
-        @reported = true
-        self["DurationMilliseconds"] += elapsed_ms
-        @parent["SqlTimingsDurationMilliseconds"] += elapsed_ms
-        @page["DurationMillisecondsInSql"] += elapsed_ms
-      end
-
-    end
-
-  end
-end
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/storage/abstract_store.rb b/lib/rack-mini-profiler/lib/mini_profiler/storage/abstract_store.rb
deleted file mode 100644
index 9d6b7524c..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/storage/abstract_store.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-module Rack
-  class MiniProfiler
-    class AbstractStore
-
-      def save(page_struct)
-        raise NotImplementedError.new("save is not implemented")
-      end
-
-      def load(id)
-        raise NotImplementedError.new("load is not implemented")
-      end
-
-      def set_unviewed(user, id)
-        raise NotImplementedError.new("set_unviewed is not implemented")
-      end
-
-      def set_viewed(user, id)
-        raise NotImplementedError.new("set_viewed is not implemented")
-      end
-
-      def get_unviewed_ids(user)
-        raise NotImplementedError.new("get_unviewed_ids is not implemented")
-      end
-
-      def diagnostics(user)
-        # this is opt in, no need to explode if not implemented
-        ""
-      end
-
-    end
-  end
-end
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/storage/file_store.rb b/lib/rack-mini-profiler/lib/mini_profiler/storage/file_store.rb
deleted file mode 100644
index 8cf7cb608..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/storage/file_store.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-module Rack
-  class MiniProfiler
-    class FileStore < AbstractStore
-
-      # Sub-class thread so we have a named thread (useful for debugging in Thread.list).
-      class CacheCleanupThread < Thread
-      end
-
-      class FileCache
-        def initialize(path, prefix)
-          @path = path
-          @prefix = prefix
-        end
-
-        def [](key)
-          begin
-            data = ::File.open(path(key),"rb") {|f| f.read}
-            return Marshal.load data
-          rescue => e
-            return nil
-          end
-        end
-
-        def []=(key,val)
-          ::File.open(path(key), "wb+") {|f| f.write Marshal.dump(val)}
-        end
-
-        private
-        def path(key)
-          @path + "/" + @prefix  + "_" + key
-        end
-      end
-
-      EXPIRES_IN_SECONDS = 60 * 60 * 24
-
-      def initialize(args = nil)
-        args ||= {}
-        @path = args[:path]
-        @expires_in_seconds = args[:expires_in] || EXPIRES_IN_SECONDS
-        raise ArgumentError.new :path unless @path
-        @timer_struct_cache = FileCache.new(@path, "mp_timers")
-        @timer_struct_lock = Mutex.new
-        @user_view_cache = FileCache.new(@path, "mp_views")
-        @user_view_lock = Mutex.new
-
-        me = self
-        t = CacheCleanupThread.new do
-          interval = 10
-          cleanup_cache_cycle = 3600
-          cycle_count = 1
-
-          begin
-            until Thread.current[:should_exit] do
-              # TODO: a sane retry count before bailing
-
-              # We don't want to hit the filesystem every 10s to clean up the cache so we need to do a bit of
-              # accounting to avoid sleeping that entire time.  We don't want to sleep for the entire period because
-              # it means the thread will stay live in hot deployment scenarios, keeping a potentially large memory
-              # graph from being garbage collected upon undeploy.
-              if cycle_count * interval >= cleanup_cache_cycle
-                cycle_count = 1
-                me.cleanup_cache
-              end
-
-              sleep(interval)
-              cycle_count += 1
-            end
-          rescue
-            # don't crash the thread, we can clean up next time
-          end
-        end
-
-        at_exit { t[:should_exit] = true }
-
-        t
-      end
-
-      def save(page_struct)
-        @timer_struct_lock.synchronize {
-          @timer_struct_cache[page_struct['Id']] = page_struct
-        }
-      end
-
-      def load(id)
-        @timer_struct_lock.synchronize {
-          @timer_struct_cache[id]
-        }
-      end
-
-      def set_unviewed(user, id)
-        @user_view_lock.synchronize {
-          current = @user_view_cache[user]
-          current = [] unless Array === current
-          current << id
-          @user_view_cache[user] = current.uniq
-        }
-      end
-
-      def set_viewed(user, id)
-        @user_view_lock.synchronize {
-          @user_view_cache[user] ||= []
-          current = @user_view_cache[user]
-          current = [] unless Array === current
-          current.delete(id)
-          @user_view_cache[user] = current.uniq
-        }
-      end
-
-      def get_unviewed_ids(user)
-        @user_view_lock.synchronize {
-          @user_view_cache[user]
-        }
-      end
-
-      def cleanup_cache
-        files = Dir.entries(@path)
-        @timer_struct_lock.synchronize {
-          files.each do |f|
-            f = @path + '/' + f
-            ::File.delete f if ::File.basename(f) =~ /^mp_timers/ and (Time.now - ::File.mtime(f)) > @expires_in_seconds
-          end
-        }
-        @user_view_lock.synchronize {
-          files.each do |f|
-            f = @path + '/' + f
-            ::File.delete f if ::File.basename(f) =~ /^mp_views/ and (Time.now - ::File.mtime(f)) > @expires_in_seconds
-          end
-        }
-      end
-
-    end
-  end
-end
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/storage/memcache_store.rb b/lib/rack-mini-profiler/lib/mini_profiler/storage/memcache_store.rb
deleted file mode 100644
index 8743b14e2..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/storage/memcache_store.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-module Rack
-  class MiniProfiler
-    class MemcacheStore < AbstractStore
-
-      EXPIRES_IN_SECONDS = 60 * 60 * 24
-      MAX_RETRIES = 10
-
-      def initialize(args = nil)
-        require 'dalli' unless defined? Dalli
-        args ||= {}
-        @prefix = args[:prefix] || "MPMemcacheStore"
-        @client = args[:client] || Dalli::Client.new
-        @expires_in_seconds = args[:expires_in] || EXPIRES_IN_SECONDS
-      end
-
-      def save(page_struct)
-        @client.set("#{@prefix}#{page_struct['Id']}", Marshal::dump(page_struct), @expires_in_seconds)
-      end
-
-      def load(id)
-        raw = @client.get("#{@prefix}#{id}")
-        if raw
-          Marshal::load raw
-        end
-      end
-
-      def set_unviewed(user, id)
-        @client.add("#{@prefix}-#{user}-v", [], @expires_in_seconds)
-        MAX_RETRIES.times do
-          break if @client.cas("#{@prefix}-#{user}-v", @expires_in_seconds) do |ids|
-            ids << id unless ids.include?(id)
-            ids
-          end
-        end
-      end
-
-      def set_viewed(user, id)
-        @client.add("#{@prefix}-#{user}-v", [], @expires_in_seconds)
-        MAX_RETRIES.times do
-          break if @client.cas("#{@prefix}-#{user}-v", @expires_in_seconds) do |ids|
-            ids.delete id
-            ids
-          end
-        end
-      end
-
-      def get_unviewed_ids(user)
-        @client.get("#{@prefix}-#{user}-v") || []
-      end
-
-    end
-  end
-end
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/storage/memory_store.rb b/lib/rack-mini-profiler/lib/mini_profiler/storage/memory_store.rb
deleted file mode 100644
index 0fad2ad1d..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/storage/memory_store.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-module Rack
-  class MiniProfiler
-    class MemoryStore < AbstractStore
-
-      # Sub-class thread so we have a named thread (useful for debugging in Thread.list).
-      class CacheCleanupThread < Thread
-      end
-
-      EXPIRES_IN_SECONDS = 60 * 60 * 24
-
-      def initialize(args = nil)
-        args ||= {}
-        @expires_in_seconds = args[:expires_in] || EXPIRES_IN_SECONDS
-        @timer_struct_lock = Mutex.new
-        @timer_struct_cache = {}
-        @user_view_lock = Mutex.new
-        @user_view_cache = {}
-
-        # TODO: fix it to use weak ref, trouble is may be broken in 1.9 so need to use the 'ref' gem
-        me = self
-        t = CacheCleanupThread.new do
-          interval = 10
-          cleanup_cache_cycle = 3600
-          cycle_count = 1
-
-          until Thread.current[:should_exit] do
-            # We don't want to hit the filesystem every 10s to clean up the cache so we need to do a bit of
-            # accounting to avoid sleeping that entire time.  We don't want to sleep for the entire period because
-            # it means the thread will stay live in hot deployment scenarios, keeping a potentially large memory
-            # graph from being garbage collected upon undeploy.
-            if cycle_count * interval >= cleanup_cache_cycle
-              cycle_count = 1
-              me.cleanup_cache
-            end
-
-            sleep(interval)
-            cycle_count += 1
-          end
-        end
-
-        at_exit { t[:should_exit] = true }
-
-        t
-      end
-
-      def save(page_struct)
-        @timer_struct_lock.synchronize {
-          @timer_struct_cache[page_struct['Id']] = page_struct
-        }
-      end
-
-      def load(id)
-        @timer_struct_lock.synchronize {
-          @timer_struct_cache[id]
-        }
-      end
-
-      def set_unviewed(user, id)
-        @user_view_lock.synchronize {
-          @user_view_cache[user] ||= []
-          @user_view_cache[user] << id
-        }
-      end
-
-      def set_viewed(user, id)
-        @user_view_lock.synchronize {
-          @user_view_cache[user] ||= []
-          @user_view_cache[user].delete(id)
-        }
-      end
-
-      def get_unviewed_ids(user)
-        @user_view_lock.synchronize {
-          @user_view_cache[user]
-        }
-      end
-
-      def cleanup_cache
-        expire_older_than = ((Time.now.to_f - @expires_in_seconds) * 1000).to_i
-        @timer_struct_lock.synchronize {
-          @timer_struct_cache.delete_if { |k, v| v['Started'] < expire_older_than }
-        }
-      end
-    end
-  end
-end
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/storage/redis_store.rb b/lib/rack-mini-profiler/lib/mini_profiler/storage/redis_store.rb
deleted file mode 100644
index 7d0b11be2..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/storage/redis_store.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-module Rack
-  class MiniProfiler
-    class RedisStore < AbstractStore
-
-      EXPIRES_IN_SECONDS = 60 * 60 * 24
-
-      def initialize(args = nil)
-        @args = args || {}
-        @prefix = @args.delete(:prefix) || 'MPRedisStore'
-        @redis_connection = @args.delete(:connection)
-        @expires_in_seconds = @args.delete(:expires_in) || EXPIRES_IN_SECONDS
-      end
-
-      def save(page_struct)
-        redis.setex "#{@prefix}#{page_struct['Id']}", @expires_in_seconds, Marshal::dump(page_struct)
-      end
-
-      def load(id)
-        raw = redis.get "#{@prefix}#{id}"
-        if raw
-          Marshal::load raw
-        end
-      end
-
-      def set_unviewed(user, id)
-        redis.sadd "#{@prefix}-#{user}-v", id
-      end
-
-      def set_viewed(user, id)
-        redis.srem "#{@prefix}-#{user}-v", id
-      end
-
-      def get_unviewed_ids(user)
-        redis.smembers "#{@prefix}-#{user}-v"
-      end
-
-      def diagnostics(user)
-"Redis prefix: #{@prefix}
-Redis location: #{redis.client.host}:#{redis.client.port} db: #{redis.client.db}
-unviewed_ids: #{get_unviewed_ids(user)}
-"
-      end
-
-      private
-
-      def redis
-        return @redis_connection if @redis_connection
-        require 'redis' unless defined? Redis
-        @redis_connection ||= Redis.new @args
-      end
-
-    end
-  end
-end
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/timer_struct.rb b/lib/rack-mini-profiler/lib/mini_profiler/timer_struct.rb
deleted file mode 100644
index 3139db6fc..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/timer_struct.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-module Rack
-  class MiniProfiler
-
-    # A base class for timing structures
-    class TimerStruct
-
-      def initialize(attrs={})
-        @attributes = attrs
-      end
-
-      def attributes
-        @attributes ||= {}
-      end
-
-      def [](name)
-        attributes[name]
-      end
-
-      def []=(name, val)
-        attributes[name] = val
-        self
-      end
-
-      def to_json(*a)
-        # this does could take in an option hash, but the only interesting there is max_nesting.
-        #   if this becomes an option we could increase
-        ::JSON.generate( @attributes, :max_nesting => 100 )
-      end
-
-    end
-
-  end
-end
diff --git a/lib/rack-mini-profiler/lib/mini_profiler/version.rb b/lib/rack-mini-profiler/lib/mini_profiler/version.rb
deleted file mode 100644
index 2a6a4b50c..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler/version.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module Rack
-  class MiniProfiler
-    VERSION = '898a13ca6797c6bc1fee313e17d388b0'.freeze
-  end
-end
\ No newline at end of file
diff --git a/lib/rack-mini-profiler/lib/mini_profiler_rails/railtie.rb b/lib/rack-mini-profiler/lib/mini_profiler_rails/railtie.rb
deleted file mode 100644
index 863539328..000000000
--- a/lib/rack-mini-profiler/lib/mini_profiler_rails/railtie.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-require 'fileutils'
-
-module Rack::MiniProfilerRails
-
-  # call direct if needed to do a defer init
-  def self.initialize!(app)
-    
-    raise "MiniProfilerRails initialized twice. Set `require: false' for rack-mini-profiler in your Gemfile" if @already_initialized
-      
-    c = Rack::MiniProfiler.config
-
-    # By default, only show the MiniProfiler in development mode, in production allow profiling if post_authorize_cb is set
-    #
-    # NOTE: this must be set here with = and not ||=
-    #  The out of the box default is "true"
-    c.pre_authorize_cb = lambda { |env|
-      !Rails.env.test?
-    }
-
-    c.skip_paths ||= []
-
-    if Rails.env.development?
-      c.skip_paths << app.config.assets.prefix if app.respond_to? :assets
-      c.skip_schema_queries = true
-    end
-
-    if Rails.env.production?
-      c.authorization_mode = :whitelist
-    end
-
-    if Rails.logger
-      c.logger = Rails.logger
-    end
-
-    # The file store is just so much less flaky
-    base_path = Rails.application.config.paths['tmp'].first rescue "#{Rails.root}/tmp"
-    tmp       = base_path + '/miniprofiler'
-    FileUtils.mkdir_p(tmp) unless File.exists?(tmp)
-
-    c.storage_options = {:path => tmp}
-    c.storage = Rack::MiniProfiler::FileStore
-
-    # Quiet the SQL stack traces
-    c.backtrace_remove = Rails.root.to_s + "/"
-    c.backtrace_includes =  [/^\/?(app|config|lib|test)/]
-    c.skip_schema_queries =  Rails.env != 'production'
-
-    # Install the Middleware
-    app.middleware.insert(0, Rack::MiniProfiler)
-
-    # Attach to various Rails methods
-    ActiveSupport.on_load(:action_controller) do
-      ::Rack::MiniProfiler.profile_method(ActionController::Base, :process) {|action| "Executing action: #{action}"}
-    end
-    ActiveSupport.on_load(:action_view) do
-      ::Rack::MiniProfiler.profile_method(ActionView::Template, :render) {|x,y| "Rendering: #{@virtual_path}"}
-    end
-    
-    @already_initialized = true
-  end
-
-  class Railtie < ::Rails::Railtie
-
-    initializer "rack_mini_profiler.configure_rails_initialization" do |app|
-      Rack::MiniProfilerRails.initialize!(app)
-    end
-
-    # TODO: Implement something better here
-    # config.after_initialize do
-    #
-    #   class ::ActionView::Helpers::AssetTagHelper::JavascriptIncludeTag
-    #     alias_method :asset_tag_orig, :asset_tag
-    #     def asset_tag(source,options)
-    #       current = Rack::MiniProfiler.current
-    #       return asset_tag_orig(source,options) unless current
-    #       wrapped = ""
-    #       unless current.mpt_init
-    #         current.mpt_init = true
-    #         wrapped << Rack::MiniProfiler::ClientTimerStruct.init_instrumentation
-    #       end
-    #       name = source.split('/')[-1]
-    #       wrapped << Rack::MiniProfiler::ClientTimerStruct.instrument(name, asset_tag_orig(source,options)).html_safe
-    #       wrapped
-    #     end
-    #   end
-
-    #   class ::ActionView::Helpers::AssetTagHelper::StylesheetIncludeTag
-    #     alias_method :asset_tag_orig, :asset_tag
-    #     def asset_tag(source,options)
-    #       current = Rack::MiniProfiler.current
-    #       return asset_tag_orig(source,options) unless current
-    #       wrapped = ""
-    #       unless current.mpt_init
-    #         current.mpt_init = true
-    #         wrapped << Rack::MiniProfiler::ClientTimerStruct.init_instrumentation
-    #       end
-    #       name = source.split('/')[-1]
-    #       wrapped << Rack::MiniProfiler::ClientTimerStruct.instrument(name, asset_tag_orig(source,options)).html_safe
-    #       wrapped
-    #     end
-    #   end
-
-    # end
-
-  end
-end
diff --git a/lib/rack-mini-profiler/lib/patches/net_patches.rb b/lib/rack-mini-profiler/lib/patches/net_patches.rb
deleted file mode 100644
index 198ae8383..000000000
--- a/lib/rack-mini-profiler/lib/patches/net_patches.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-if (defined?(Net) && defined?(Net::HTTP))
-
-  Net::HTTP.class_eval do
-    def request_with_mini_profiler(*args, &block)
-      request = args[0]
-      Rack::MiniProfiler.step("Net::HTTP #{request.method} #{request.path}") do
-        request_without_mini_profiler(*args, &block)
-      end
-    end
-    alias request_without_mini_profiler request
-    alias request request_with_mini_profiler
-  end
-
-end
diff --git a/lib/rack-mini-profiler/lib/patches/sql_patches.rb b/lib/rack-mini-profiler/lib/patches/sql_patches.rb
deleted file mode 100644
index c1e8e67ff..000000000
--- a/lib/rack-mini-profiler/lib/patches/sql_patches.rb
+++ /dev/null
@@ -1,284 +0,0 @@
-class SqlPatches
-
-  def self.patched?
-    @patched
-  end
-
-  def self.patched=(val)
-    @patched = val
-  end
-
-  def self.class_exists?(name)
-    eval(name + ".class").to_s.eql?('Class')
-  rescue NameError
-    false
-  end
-
-  def self.module_exists?(name)
-    eval(name + ".class").to_s.eql?('Module')
-  rescue NameError
-    false
-  end
-end
-
-# The best kind of instrumentation is in the actual db provider, however we don't want to double instrument
-if SqlPatches.class_exists? "Mysql2::Client"
-
-  class Mysql2::Result
-    alias_method :each_without_profiling, :each
-    def each(*args, &blk)
-      return each_without_profiling(*args, &blk) unless @miniprofiler_sql_id
-
-      start = Time.now
-      result = each_without_profiling(*args,&blk)
-      elapsed_time = ((Time.now - start).to_f * 1000).round(1)
-
-      @miniprofiler_sql_id.report_reader_duration(elapsed_time)
-      result
-    end
-  end
-
-  class Mysql2::Client
-    alias_method :query_without_profiling, :query
-    def query(*args,&blk)
-      current = ::Rack::MiniProfiler.current
-      return query_without_profiling(*args,&blk) unless current && current.measure
-
-      start = Time.now
-      result = query_without_profiling(*args,&blk)
-      elapsed_time = ((Time.now - start).to_f * 1000).round(1)
-      record = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
-      result.instance_variable_set("@miniprofiler_sql_id", record) if result
-
-      result
-
-    end
-  end
-
-  SqlPatches.patched = true
-end
-
-
-# PG patches, keep in mind exec and async_exec have a exec{|r| } semantics that is yet to be implemented
-if SqlPatches.class_exists? "PG::Result"
-
-  class PG::Result
-    alias_method :each_without_profiling, :each
-    alias_method :values_without_profiling, :values
-
-    def values(*args, &blk)
-      return values_without_profiling(*args, &blk) unless @miniprofiler_sql_id
-
-      start = Time.now
-      result = values_without_profiling(*args,&blk)
-      elapsed_time = ((Time.now - start).to_f * 1000).round(1)
-
-      @miniprofiler_sql_id.report_reader_duration(elapsed_time)
-      result
-    end
-
-    def each(*args, &blk)
-      return each_without_profiling(*args, &blk) unless @miniprofiler_sql_id
-
-      start = Time.now
-      result = each_without_profiling(*args,&blk)
-      elapsed_time = ((Time.now - start).to_f * 1000).round(1)
-
-      @miniprofiler_sql_id.report_reader_duration(elapsed_time)
-      result
-    end
-  end
-
-  class PG::Connection
-    alias_method :exec_without_profiling, :exec
-    alias_method :async_exec_without_profiling, :async_exec
-    alias_method :exec_prepared_without_profiling, :exec_prepared
-    alias_method :send_query_prepared_without_profiling, :send_query_prepared
-    alias_method :prepare_without_profiling, :prepare
-
-    def prepare(*args,&blk)
-      # we have no choice but to do this here,
-      # if we do the check for profiling first, our cache may miss critical stuff
-
-      @prepare_map ||= {}
-      @prepare_map[args[0]] = args[1]
-      # dont leak more than 10k ever
-      @prepare_map = {} if @prepare_map.length > 1000
-
-      current = ::Rack::MiniProfiler.current
-      return prepare_without_profiling(*args,&blk) unless current && current.measure
-
-      prepare_without_profiling(*args,&blk)
-    end
-
-    def exec(*args,&blk)
-      current = ::Rack::MiniProfiler.current
-      return exec_without_profiling(*args,&blk) unless current && current.measure
-
-      start = Time.now
-      result = exec_without_profiling(*args,&blk)
-      elapsed_time = ((Time.now - start).to_f * 1000).round(1)
-      record = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
-      result.instance_variable_set("@miniprofiler_sql_id", record) if result
-
-      result
-    end
-
-    def exec_prepared(*args,&blk)
-      current = ::Rack::MiniProfiler.current
-      return exec_prepared_without_profiling(*args,&blk) unless current && current.measure
-
-      start = Time.now
-      result = exec_prepared_without_profiling(*args,&blk)
-      elapsed_time = ((Time.now - start).to_f * 1000).round(1)
-      mapped = args[0]
-      mapped = @prepare_map[mapped] || args[0] if @prepare_map
-      record = ::Rack::MiniProfiler.record_sql(mapped, elapsed_time)
-      result.instance_variable_set("@miniprofiler_sql_id", record) if result
-
-      result
-    end
-
-    def send_query_prepared(*args,&blk)
-      current = ::Rack::MiniProfiler.current
-      return send_query_prepared_without_profiling(*args,&blk) unless current && current.measure
-
-      start = Time.now
-      result = send_query_prepared_without_profiling(*args,&blk)
-
-      elapsed_time = ((Time.now - start).to_f * 1000).round(1)
-      mapped = args[0]
-      mapped = @prepare_map[mapped] || args[0] if @prepare_map
-      record = ::Rack::MiniProfiler.record_sql(mapped, elapsed_time)
-      result.instance_variable_set("@miniprofiler_sql_id", record) if result
-
-      result
-    end
-
-    def async_exec(*args,&blk)
-      current = ::Rack::MiniProfiler.current
-      return exec_without_profiling(*args,&blk) unless current && current.measure
-
-      start = Time.now
-      result = exec_without_profiling(*args,&blk)
-      elapsed_time = ((Time.now - start).to_f * 1000).round(1)
-      record = ::Rack::MiniProfiler.record_sql(args[0], elapsed_time)
-      result.instance_variable_set("@miniprofiler_sql_id", record) if result
-
-      result
-    end
-
-    alias_method :query, :exec
-  end
-
-  SqlPatches.patched = true
-end
-
-
-# Mongoid 3 patches
-if SqlPatches.class_exists?("Moped::Node")
-  class Moped::Node
-    alias_method :process_without_profiling, :process
-    def process(*args,&blk)
-      current = ::Rack::MiniProfiler.current
-      return process_without_profiling(*args,&blk) unless current && current.measure
-
-      start = Time.now
-      result = process_without_profiling(*args,&blk)
-      elapsed_time = ((Time.now - start).to_f * 1000).round(1)
-      ::Rack::MiniProfiler.record_sql(args[0].log_inspect, elapsed_time)
-
-      result
-    end
-  end
-end
-
-if SqlPatches.class_exists?("RSolr::Connection") && RSolr::VERSION[0] != "0" #  requires at least v1.0.0
-  class RSolr::Connection
-    alias_method :execute_without_profiling, :execute
-    def execute_with_profiling(client, request_context)
-      current = ::Rack::MiniProfiler.current
-      return execute_without_profiling(client, request_context) unless current && current.measure
-
-      start = Time.now
-      result = execute_without_profiling(client, request_context)
-      elapsed_time = ((Time.now - start).to_f * 1000).round(1)
-
-      data = "#{request_context[:method].upcase} #{request_context[:uri]}"
-      if request_context[:method] == :post and request_context[:data]
-        if request_context[:headers].include?("Content-Type") and request_context[:headers]["Content-Type"] == "text/xml"
-          # it's xml, unescaping isn't needed
-          data << "\n#{request_context[:data]}"
-        else
-          data << "\n#{Rack::Utils.unescape(request_context[:data])}"
-        end
-      end
-      ::Rack::MiniProfiler.record_sql(data, elapsed_time)
-
-      result
-    end
-    alias_method :execute, :execute_with_profiling
-  end
-end
-
-
-# Fallback for sequel
-if SqlPatches.class_exists?("Sequel::Database") && !SqlPatches.patched?
-  module Sequel
-    class Database
-      alias_method :log_duration_original, :log_duration
-      def log_duration(duration, message)
-        # `duration` will be in seconds, but we need it in milliseconds for internal consistency.
-        ::Rack::MiniProfiler.record_sql(message, duration * 1000)
-        log_duration_original(duration, message)
-      end
-    end
-  end
-end
-
-
-## based off https://github.com/newrelic/rpm/blob/master/lib/new_relic/agent/instrumentation/active_record.rb
-## fallback for alls sorts of weird dbs
-if SqlPatches.module_exists?('ActiveRecord') && !SqlPatches.patched?
-  module Rack
-    class MiniProfiler
-      module ActiveRecordInstrumentation
-        def self.included(instrumented_class)
-          instrumented_class.class_eval do
-            unless instrumented_class.method_defined?(:log_without_miniprofiler)
-              alias_method :log_without_miniprofiler, :log
-              alias_method :log, :log_with_miniprofiler
-              protected :log
-            end
-          end
-        end
-
-        def log_with_miniprofiler(*args, &block)
-          current = ::Rack::MiniProfiler.current
-          return log_without_miniprofiler(*args, &block) unless current && current.measure
-
-          sql, name, binds = args
-          t0 = Time.now
-          rval = log_without_miniprofiler(*args, &block)
-
-          # Don't log schema queries if the option is set
-          return rval if Rack::MiniProfiler.config.skip_schema_queries and name =~ /SCHEMA/
-
-          elapsed_time = ((Time.now - t0).to_f * 1000).round(1)
-          Rack::MiniProfiler.record_sql(sql, elapsed_time)
-          rval
-        end
-      end
-    end
-
-    def self.insert_instrumentation
-      ActiveRecord::ConnectionAdapters::AbstractAdapter.module_eval do
-        include ::Rack::MiniProfiler::ActiveRecordInstrumentation
-      end
-    end
-
-    if defined?(::Rails) && !SqlPatches.patched?
-      insert_instrumentation
-    end
-  end
-end
diff --git a/lib/rack-mini-profiler/lib/rack-mini-profiler.rb b/lib/rack-mini-profiler/lib/rack-mini-profiler.rb
deleted file mode 100644
index d254e1d6c..000000000
--- a/lib/rack-mini-profiler/lib/rack-mini-profiler.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'mini_profiler/profiler'
-require 'patches/sql_patches'
-require 'patches/net_patches'
-
-if defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i >= 3
-  require 'mini_profiler_rails/railtie'
-end
diff --git a/lib/rack-mini-profiler/rack-mini-profiler.gemspec b/lib/rack-mini-profiler/rack-mini-profiler.gemspec
deleted file mode 100644
index 7b1bb92e7..000000000
--- a/lib/rack-mini-profiler/rack-mini-profiler.gemspec
+++ /dev/null
@@ -1,35 +0,0 @@
-Gem::Specification.new do |s|
-	s.name = "rack-mini-profiler"
-	s.version = "0.9.1"
-	s.summary = "Profiles loading speed for rack applications."
-	s.authors = ["Sam Saffron", "Robin Ward","Aleks Totic"]
-	s.description = "Profiling toolkit for Rack applications with Rails integration. Client Side profiling, DB profiling and Server profiling."
-	s.email = "sam.saffron@gmail.com"
-	s.homepage = "http://miniprofiler.com"
-  s.license = "MIT"
-	s.files = [
-		'rack-mini-profiler.gemspec',
-	].concat( Dir.glob('lib/**/*').reject {|f| File.directory?(f) || f =~ /~$/ } )
-	s.extra_rdoc_files = [
-		"README.md",
-    "CHANGELOG"
-	]
-	s.add_runtime_dependency 'rack', '>= 1.1.3'
-  if RUBY_VERSION < "1.9"
-    s.add_runtime_dependency 'json', '>= 1.6'
-  end
-
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rack-test'
-  s.add_development_dependency 'activerecord', '~> 3.0'
-  s.add_development_dependency 'dalli'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'ZenTest'
-  s.add_development_dependency 'autotest'
-  s.add_development_dependency 'redis'
-  s.add_development_dependency 'therubyracer'
-  s.add_development_dependency 'less'
-  s.add_development_dependency 'flamegraph'
-
-  s.require_paths = ["lib"]
-end
diff --git a/lib/rack-mini-profiler/spec/components/client_settings_spec.rb b/lib/rack-mini-profiler/spec/components/client_settings_spec.rb
deleted file mode 100644
index 88b7108ac..000000000
--- a/lib/rack-mini-profiler/spec/components/client_settings_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'spec_helper'
-require 'mini_profiler/client_settings'
-require 'uri'
-require 'rack'
-
-describe Rack::MiniProfiler::ClientSettings do
-
-  describe "with settings" do
-    before do
-      settings = URI.encode_www_form_component("dp=t,bt=1")
-      @settings = Rack::MiniProfiler::ClientSettings.new({"HTTP_COOKIE" => "__profilin=#{settings};" })
-    end
-
-    it 'has the cookies' do
-      @settings.has_cookie?.should be_true 
-    end
-
-    it 'has profiling disabled' do 
-      @settings.disable_profiling?.should be_true
-    end
-
-    it 'has backtrace set to full' do 
-      @settings.backtrace_full?.should be_true
-    end
-
-    it 'should not write cookie changes if no change' do 
-      hash = {}
-      @settings.write!(hash)
-      hash.should == {}
-    end
-
-    it 'should correctly write cookie changes if changed' do
-      @settings.disable_profiling = false
-      hash = {}
-      @settings.write!(hash)
-      hash.should_not == {}
-    end
-  end
-
-  it "should not have settings by default" do 
-    Rack::MiniProfiler::ClientSettings.new({}).has_cookie?.should == false
-  end
-
-
-end
diff --git a/lib/rack-mini-profiler/spec/components/client_timer_struct_spec.rb b/lib/rack-mini-profiler/spec/components/client_timer_struct_spec.rb
deleted file mode 100644
index f5bd1d794..000000000
--- a/lib/rack-mini-profiler/spec/components/client_timer_struct_spec.rb
+++ /dev/null
@@ -1,162 +0,0 @@
-require 'spec_helper'
-require 'rack-mini-profiler'
-require 'yaml'
-
-describe Rack::MiniProfiler::ClientTimerStruct do
-
-  def new_page
-    Rack::MiniProfiler::PageTimerStruct.new({})
-  end
-
-  def fixture(name)
-    YAML.load(File.open(File.dirname(__FILE__) + "/../fixtures/#{name}.yml"))
-  end
-
-  before do
-    @client = Rack::MiniProfiler::ClientTimerStruct.new
-  end
-
-  it 'defaults to no attributes' do
-    ::JSON.parse(@client.to_json).should be_empty
-  end
-
-  describe 'init_from_form_data' do
-
-    describe 'without a form' do
-      before do
-        @client = Rack::MiniProfiler::ClientTimerStruct.init_from_form_data({}, new_page)
-      end
-      
-      it 'is null' do
-        @client.should be_nil
-      end
-
-    end
-
-    describe 'with a simple request' do
-      before do
-        @client = Rack::MiniProfiler::ClientTimerStruct.init_from_form_data(fixture(:simple_client_request), new_page)
-      end
-
-      it 'has the correct RedirectCount' do
-        @client['RedirectCount'].should == 1
-      end
-
-      it 'has Timings' do
-        @client['Timings'].should_not be_empty
-      end
-      
-      describe "bob.js" do
-        before do
-          @bob = @client['Timings'].find {|t| t["Name"] == "bob.js"}
-        end
-
-        it 'has it in the timings' do 
-          @bob.should_not be_nil
-        end
-
-        it 'has the correct duration' do 
-          @bob["Duration"].should == 6
-        end
-        
-      end
-
-      describe "Navigation" do
-        before do
-          @nav = @client['Timings'].find {|t| t["Name"] == "Navigation"}
-        end
-
-        it 'has a Timing for the Navigation' do          
-          @nav.should_not be_nil
-        end
-
-        it 'has the correct start' do
-          @nav['Start'].should == 0
-        end
-
-        it 'has the correct duration' do     
-          @nav['Duration'].should == 16
-        end
-      end
-
-      describe "Simple" do
-        before do
-          @simple = @client['Timings'].find {|t| t["Name"] == "Simple"}
-        end
-
-        it 'has a Timing for the Simple' do          
-          @simple.should_not be_nil
-        end
-
-        it 'has the correct start' do          
-          @simple['Start'].should == 1
-        end
-
-        it 'has the correct duration' do          
-          @simple['Duration'].should == 10
-        end
-      end      
-
-    end
-
-    describe 'with some odd values' do
-      before do
-        @client = Rack::MiniProfiler::ClientTimerStruct.init_from_form_data(fixture(:weird_client_request), new_page)        
-      end
-
-      it 'has the correct RedirectCount' do
-        @client['RedirectCount'].should == 99
-      end
-
-      it 'has Timings' do
-        @client['Timings'].should_not be_empty
-      end
-
-      it 'has no timing when the start is before Navigation' do          
-        @client['Timings'].find {|t| t["Name"] == "Previous"}.should be_nil
-      end
-  
-      describe "weird" do
-        before do
-          @weird = @client['Timings'].find {|t| t["Name"] == "Weird"}
-        end
-
-        it 'has a Timing for the Weird' do          
-          @weird.should_not be_nil
-        end
-
-        it 'has the correct start' do          
-          @weird['Start'].should == 11
-        end
-
-        it 'has a 0 duration because start time is greater than end time' do          
-          @weird['Duration'].should == 0
-        end
-      end      
-
-      describe "differentFormat" do
-        before do
-          @diff = @client['Timings'].find {|t| t["Name"] == "differentFormat"}
-        end
-
-        it 'has a Timing for the differentFormat' do          
-          @diff.should_not be_nil
-        end
-
-        it 'has the correct start' do          
-          @diff['Start'].should == 1
-        end
-
-        it 'has a -1 duration because the format was different' do          
-          @diff['Duration'].should == -1
-        end
-      end
-
-    end
-
-
-
-  end
-
-
-end
diff --git a/lib/rack-mini-profiler/spec/components/config_spec.rb b/lib/rack-mini-profiler/spec/components/config_spec.rb
deleted file mode 100644
index b174bb1fd..000000000
--- a/lib/rack-mini-profiler/spec/components/config_spec.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'spec_helper'
-require 'rack-mini-profiler'
-
-module Rack
-  describe MiniProfiler::Config do
-
-    describe '.default' do
-      it 'has "enabled" set to true' do
-        MiniProfiler::Config.default.enabled.should be_true
-      end
-    end
-
-  end
-end
\ No newline at end of file
diff --git a/lib/rack-mini-profiler/spec/components/file_store_spec.rb b/lib/rack-mini-profiler/spec/components/file_store_spec.rb
deleted file mode 100644
index e96b875d0..000000000
--- a/lib/rack-mini-profiler/spec/components/file_store_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require 'spec_helper'
-require 'rack-mini-profiler'
-require 'mini_profiler/page_timer_struct'
-require 'mini_profiler/storage/abstract_store'
-require 'mini_profiler/storage/file_store'
-
-describe Rack::MiniProfiler::FileStore do
-
-  context 'page struct' do
-
-    before do
-      tmp = File.expand_path(__FILE__ + "/../../../tmp")
-      Dir::mkdir(tmp) unless File.exists?(tmp)
-      @store = Rack::MiniProfiler::FileStore.new(:path => tmp) 
-    end
-
-    describe 'storage' do
-
-      it 'can store a PageStruct and retrieve it' do
-        page_struct = Rack::MiniProfiler::PageTimerStruct.new({})
-        page_struct['Id'] = "XYZ"
-        page_struct['Random'] = "random"
-        @store.save(page_struct)
-        page_struct = @store.load("XYZ")
-        page_struct['Random'].should == "random"
-        page_struct['Id'].should == "XYZ"
-      end    
-
-      it 'can list unviewed items for a user' do 
-        @store.set_unviewed('a', 'XYZ')
-        @store.set_unviewed('a', 'ABC')
-        @store.get_unviewed_ids('a').sort.to_a.should == ['XYZ', 'ABC'].sort.to_a
-      end
-
-      it 'can set an item to viewed once it is unviewed' do 
-        @store.set_unviewed('a', 'XYZ')
-        @store.set_unviewed('a', 'ABC')
-        @store.set_viewed('a', 'XYZ')
-        @store.get_unviewed_ids('a').should == ['ABC']
-      end
-
-    end
-
-  end
-
-end
diff --git a/lib/rack-mini-profiler/spec/components/gc_profiler_spec.rb b/lib/rack-mini-profiler/spec/components/gc_profiler_spec.rb
deleted file mode 100644
index 19ebf5bce..000000000
--- a/lib/rack-mini-profiler/spec/components/gc_profiler_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'spec_helper'
-require 'rack-mini-profiler'
-require 'mini_profiler/gc_profiler'
-
-describe Rack::MiniProfiler::GCProfiler do
-  before :each do
-    @app = lambda do |env|
-      env
-    end
-    @env = {}
-    @profiler = Rack::MiniProfiler::GCProfiler.new
-  end
-
-  describe '#profile_gc_time' do
-    it 'doesn\'t enable the gc if it was disabled previously' do
-      GC.disable
-
-      expect {
-        @profiler.profile_gc_time(@app, @env)
-      }.to_not change { GC.disable }
-
-      # Let's re-enable the GC for the rest of the test suite
-      GC.enable
-    end
-
-    it 'keeps the GC enable if it was enabled previously' do
-      expect {
-        @profiler.profile_gc_time(@app, @env)
-      }.to_not change { GC.enable }
-    end
-
-    it 'doesn\'t leave the GC Profiler enabled if it was disabled previously' do
-      GC::Profiler.enable
-
-      expect {
-        @profiler.profile_gc_time(@app, @env)
-      }.to_not change { GC::Profiler.enabled? }
-
-      GC::Profiler.disable
-    end
-
-
-    it 'keeps the GC Profiler disabled if it was disabled previously' do
-      expect {
-        @profiler.profile_gc_time(@app, @env)
-      }.to_not change { GC::Profiler.enabled? }
-    end
-  end
-
-  describe '#profile_gc' do
-    it 'doesn\'t leave the GC enabled if it was disabled previously' do
-      GC.disable
-
-      expect {
-        @profiler.profile_gc(@app, @env)
-      }.to_not change { GC.disable }
-
-      # Let's re-enable the GC for the rest of the test suite
-      GC.enable
-    end
-
-    it 'keeps the GC enabled if it was enabled previously' do
-      expect {
-        @profiler.profile_gc(@app, @env)
-      }.to_not change { GC.enable }
-    end
-
-  end
-end
diff --git a/lib/rack-mini-profiler/spec/components/memcache_store_spec.rb b/lib/rack-mini-profiler/spec/components/memcache_store_spec.rb
deleted file mode 100644
index bfc625a2d..000000000
--- a/lib/rack-mini-profiler/spec/components/memcache_store_spec.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-require 'spec_helper'
-require 'rack-mini-profiler'
-require 'mini_profiler/page_timer_struct'
-require 'mini_profiler/storage/abstract_store'
-require 'mini_profiler/storage/memcache_store'
-
-describe Rack::MiniProfiler::MemcacheStore do
-
-  context 'page struct' do
-
-    before do
-      @store = Rack::MiniProfiler::MemcacheStore.new
-    end
-
-    describe 'storage' do
-
-      it 'can store a PageStruct and retrieve it' do
-        page_struct = Rack::MiniProfiler::PageTimerStruct.new({})
-        page_struct['Id'] = "XYZ"
-        page_struct['Random'] = "random"
-        @store.save(page_struct)
-        page_struct = @store.load("XYZ")
-        page_struct['Random'].should == "random"
-        page_struct['Id'].should == "XYZ"
-      end
-
-      it 'can list unviewed items for a user' do
-        @store.set_unviewed('a', 'XYZ')
-        @store.set_unviewed('a', 'ABC')
-        @store.get_unviewed_ids('a').length.should == 2
-        @store.get_unviewed_ids('a').include?('XYZ').should be_true
-        @store.get_unviewed_ids('a').include?('ABC').should be_true
-      end
-
-      it 'can set an item to viewed once it is unviewed' do
-        @store.set_unviewed('a', 'XYZ')
-        @store.set_unviewed('a', 'ABC')
-        @store.set_viewed('a', 'XYZ')
-        @store.get_unviewed_ids('a').should == ['ABC']
-      end
-
-    end
-
-  end
-
-  context 'passing in a Memcache client' do
-    describe 'client' do
-      it 'uses the passed in object rather than creating a new one' do
-        client = double("memcache-client")
-        store = Rack::MiniProfiler::MemcacheStore.new(:client => client)
-
-        client.should_receive(:get)
-        Dalli::Client.should_not_receive(:new)
-        store.load("XYZ")
-      end
-    end
-  end
-
-end
diff --git a/lib/rack-mini-profiler/spec/components/memory_store_spec.rb b/lib/rack-mini-profiler/spec/components/memory_store_spec.rb
deleted file mode 100644
index aa5caed6d..000000000
--- a/lib/rack-mini-profiler/spec/components/memory_store_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'spec_helper'
-require 'mini_profiler/storage/abstract_store'
-require 'mini_profiler/storage/memory_store'
-
-describe Rack::MiniProfiler::MemoryStore do
-
-  context 'page struct' do
-
-    before do
-      @store = Rack::MiniProfiler::MemoryStore.new
-    end
-
-    describe 'storage' do
-
-      it 'can store a PageStruct and retrieve it' do
-        page_struct = {'Id' => "XYZ", 'Random' => "random"}
-        @store.save(page_struct)
-        page_struct = @store.load("XYZ")
-        page_struct['Id'].should == "XYZ"
-        page_struct['Random'].should == "random"
-      end    
-
-      it 'can list unviewed items for a user' do 
-        @store.set_unviewed('a', 'XYZ')
-        @store.set_unviewed('a', 'ABC')
-        @store.get_unviewed_ids('a').should == ['XYZ', 'ABC']
-      end
-
-      it 'can set an item to viewed once it is unviewed' do 
-        @store.set_unviewed('a', 'XYZ')
-        @store.set_unviewed('a', 'ABC')
-        @store.set_viewed('a', 'XYZ')
-        @store.get_unviewed_ids('a').should == ['ABC']
-      end
-
-    end
-
-  end
-
-end
diff --git a/lib/rack-mini-profiler/spec/components/page_timer_struct_spec.rb b/lib/rack-mini-profiler/spec/components/page_timer_struct_spec.rb
deleted file mode 100644
index 58a8bf75f..000000000
--- a/lib/rack-mini-profiler/spec/components/page_timer_struct_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'spec_helper'
-require 'rack-mini-profiler'
-
-describe Rack::MiniProfiler::PageTimerStruct do
-
-  before do
-    @page = Rack::MiniProfiler::PageTimerStruct.new({})
-  end
-
-  it 'has an Id' do
-    @page['Id'].should_not be_nil
-  end
-
-  it 'has a Root' do
-    @page['Root'].should_not be_nil
-  end
-
-  describe 'to_json' do
-    before do
-      @json = @page.to_json
-      @deserialized = ::JSON.parse(@json)
-    end
-
-    it 'has a Started element' do
-      @deserialized['Started'].should_not be_nil
-    end
-
-    it 'has a DurationMilliseconds element' do
-      @deserialized['DurationMilliseconds'].should_not be_nil
-    end
-  end
-  
-end
diff --git a/lib/rack-mini-profiler/spec/components/profiler_spec.rb b/lib/rack-mini-profiler/spec/components/profiler_spec.rb
deleted file mode 100644
index 533cf9c72..000000000
--- a/lib/rack-mini-profiler/spec/components/profiler_spec.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-require 'spec_helper'
-require 'rack-mini-profiler'
-
-describe Rack::MiniProfiler do
-
-  describe 'unique id' do
-
-    before do
-      @unique = Rack::MiniProfiler.generate_id
-    end
-
-    it 'is not nil' do
-      @unique.should_not be_nil
-    end
-
-    it 'is not empty' do
-      @unique.should_not be_empty
-    end
-
-    describe 'configuration' do
-
-      it 'allows us to set configuration settings' do
-        Rack::MiniProfiler.config.auto_inject = false
-        Rack::MiniProfiler.config.auto_inject.should == false
-      end
-
-      it 'allows us to start the profiler disabled' do
-        Rack::MiniProfiler.config.enabled = false
-        Rack::MiniProfiler.config.enabled.should == false
-      end
-
-      it 'can reset the settings' do
-        Rack::MiniProfiler.config.auto_inject = false
-        Rack::MiniProfiler.reset_config
-        Rack::MiniProfiler.config.auto_inject.should be_true
-      end
-
-      describe 'base_url_path' do
-        it 'adds a trailing slash onto the base_url_path' do
-          profiler = Rack::MiniProfiler.new(nil, :base_url_path => "/test-resource")
-          profiler.config.base_url_path.should == "/test-resource/"
-        end
-
-        it "doesn't add the trailing slash when it's already there" do
-          profiler = Rack::MiniProfiler.new(nil, :base_url_path => "/test-resource/")
-          profiler.config.base_url_path.should == "/test-resource/"
-        end
-
-      end
-
-    end
-  end
-
-  describe 'profile method' do
-    before do
-      Rack::MiniProfiler.create_current
-      class TestClass
-        def foo(bar,baz)
-          return [bar, baz, yield]
-        end
-      end
-    end
-
-    it 'should not destroy a method' do
-      Rack::MiniProfiler.profile_method TestClass, :foo
-      TestClass.new.foo("a","b"){"c"}.should == ["a","b","c"]
-      Rack::MiniProfiler.unprofile_method TestClass, :foo
-    end
-
-  end
-
-  describe 'step' do
-
-    describe 'basic usage' do
-      it 'yields the block given' do
-        Rack::MiniProfiler.create_current
-        Rack::MiniProfiler.step('test') { "mini profiler" }.should == "mini profiler"
-      end
-    end
-
-
-    describe 'typical usage' do
-      before(:all) do
-        Rack::MiniProfiler.create_current
-        Time.now = Time.new
-        Time.now += 1
-        Rack::MiniProfiler.step('outer') {
-          Time.now +=  2
-          Rack::MiniProfiler.step('inner') {
-            Time.now += 3
-          }
-          Time.now += 4
-        }
-        @page_struct = Rack::MiniProfiler.current.page_struct
-        @root = @page_struct.root
-        @root.record_time
-
-        @outer = @page_struct.root.children[0]
-        @inner = @outer.children[0]
-      end
-
-      after(:all) do
-        Time.back_to_normal
-      end
-
-      it 'measures total duration correctly' do
-        @page_struct.duration_ms.to_i.should == 10 * 1000
-      end
-
-      it 'measures outer start time correctly' do
-        @outer.start_ms.to_i.should == 1 * 1000
-      end
-
-      it 'measures outer duration correctly' do
-        @outer.duration_ms.to_i.should == 9 * 1000
-      end
-
-      it 'measures inner start time correctly' do
-        @inner.start_ms.to_i.should == 3 * 1000
-      end
-
-      it 'measures inner duration correctly' do
-        @inner.duration_ms.to_i.should == 3 * 1000
-      end
-
-    end
-
-  end
-
-end
-
diff --git a/lib/rack-mini-profiler/spec/components/redis_store_spec.rb b/lib/rack-mini-profiler/spec/components/redis_store_spec.rb
deleted file mode 100644
index bbdadf6ff..000000000
--- a/lib/rack-mini-profiler/spec/components/redis_store_spec.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-require 'spec_helper'
-require 'rack-mini-profiler'
-require 'mini_profiler/page_timer_struct'
-require 'mini_profiler/storage/abstract_store'
-require 'mini_profiler/storage/redis_store'
-
-describe Rack::MiniProfiler::RedisStore do
-
-  context 'establishing a connection to something other than the default' do
-    before do
-      @store = Rack::MiniProfiler::RedisStore.new(:db=>2)
-    end
-
-    describe "connection" do
-      it 'can still store the resulting value' do
-        page_struct = Rack::MiniProfiler::PageTimerStruct.new({})
-        page_struct['Id'] = "XYZ"
-        page_struct['Random'] = "random"
-        @store.save(page_struct)
-      end
-
-      it 'uses the correct db' do
-        # redis is private, and possibly should remain so?
-        underlying_client = @store.send(:redis).client
-
-        underlying_client.db.should == 2
-      end
-    end
-  end
-
-  context 'passing in a Redis connection' do
-    describe 'connection' do
-      it 'uses the passed in object rather than creating a new one' do
-        connection = double("redis-connection")
-        store = Rack::MiniProfiler::RedisStore.new(:connection => connection)
-
-        connection.should_receive(:get)
-        Redis.should_not_receive(:new)
-        store.load("XYZ")
-      end
-    end
-  end
-
-  context 'page struct' do
-
-    before do
-      @store = Rack::MiniProfiler::RedisStore.new(nil)
-    end
-
-    describe 'storage' do
-
-      it 'can store a PageStruct and retrieve it' do
-        page_struct = Rack::MiniProfiler::PageTimerStruct.new({})
-        page_struct['Id'] = "XYZ"
-        page_struct['Random'] = "random"
-        @store.save(page_struct)
-        page_struct = @store.load("XYZ")
-        page_struct['Random'].should == "random"
-        page_struct['Id'].should == "XYZ"
-      end
-
-      it 'can list unviewed items for a user' do
-        @store.set_unviewed('a', 'XYZ')
-        @store.set_unviewed('a', 'ABC')
-        @store.get_unviewed_ids('a').should =~ ['XYZ', 'ABC']
-      end
-
-      it 'can set an item to viewed once it is unviewed' do
-        @store.set_unviewed('a', 'XYZ')
-        @store.set_unviewed('a', 'ABC')
-        @store.set_viewed('a', 'XYZ')
-        @store.get_unviewed_ids('a').should == ['ABC']
-      end
-
-    end
-
-  end
-
-end
diff --git a/lib/rack-mini-profiler/spec/components/request_timer_struct_spec.rb b/lib/rack-mini-profiler/spec/components/request_timer_struct_spec.rb
deleted file mode 100644
index de6beb0b4..000000000
--- a/lib/rack-mini-profiler/spec/components/request_timer_struct_spec.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-require 'spec_helper'
-require 'rack-mini-profiler'
-
-describe Rack::MiniProfiler::RequestTimerStruct do
-
-  def new_page
-    Rack::MiniProfiler::PageTimerStruct.new({})
-  end
-
-  before do
-    @name = 'cool request'
-    @request = Rack::MiniProfiler::RequestTimerStruct.createRoot(@name, new_page)
-  end
-
-  it 'sets IsRoot to true' do
-    @request['IsRoot'].should be_true
-  end
-
-  it 'has an Id' do
-    @request['Id'].should_not be_nil
-  end
-
-  it 'has a Root' do
-    @request['Name'].should == @name
-  end
-
-  it 'begins with a children duration of 0' do
-    @request.children_duration.should == 0
-  end
-
-  it 'has a false HasChildren attribute' do
-    @request['HasChildren'].should be_false
-  end
-
-  it 'has an empty Children attribute' do
-    @request['Children'].should be_empty
-  end
-
-  it 'has a depth of 0' do
-    @request['Depth'].should == 0
-  end
-
-  it 'has a false HasSqlTimings attribute' do
-    @request['HasSqlTimings'].should be_false
-  end
-
-  it 'has no sql timings at first' do
-    @request['SqlTimings'].should be_empty    
-  end
-
-  it 'has a 0 for SqlTimingsDurationMilliseconds' do
-    @request['SqlTimingsDurationMilliseconds'].should == 0
-  end
-
-  describe 'add SQL' do
-
-    before do
-      @page = new_page
-      @request.add_sql("SELECT 1 FROM users", 77, @page)
-    end
-
-    it 'has a true HasSqlTimings attribute' do
-      @request['HasSqlTimings'].should be_true
-    end
-
-    it 'has the SqlTiming object' do
-      @request['SqlTimings'].should_not be_empty  
-    end
-
-    it 'has a child with the ParentTimingId of the request' do
-      @request['SqlTimings'][0]['ParentTimingId'].should == @request['Id']
-    end
-
-    it 'increases SqlTimingsDurationMilliseconds' do
-      @request['SqlTimingsDurationMilliseconds'].should == 77
-    end
-
-    it "increases the page's " do
-      @page['DurationMillisecondsInSql'].should == 77
-    end
-
-  end
-
-  describe 'record time' do
-
-    describe 'add children' do
-
-      before do
-        @child = @request.add_child('child')
-        @child.record_time(1111)        
-      end
-
-      it 'has a IsRoot value of false' do
-        @child['IsRoot'].should be_false
-      end
-
-      it 'has a true HasChildren attribute' do
-        @request['HasChildren'].should be_true
-      end
-
-      it 'has the child in the Children attribute' do
-        @request['Children'].should == [@child]
-      end      
-
-      it 'assigns its Id to the child' do
-        @child['ParentTimingId'].should == @request['Id']
-      end
-
-      it 'assigns a depth of 1 to the child' do
-        @child['Depth'].should == 1
-      end
-
-      it 'increases the children duration' do
-        @request.children_duration.should == 1111
-      end
-
-      it 'marks short timings as trivial' do
-        @request.record_time(1)
-        @request['IsTrivial'].should be_true
-      end
-
-      
-      describe 'record time on parent' do
-        before do
-          @request.record_time(1234)
-        end
-
-        it "is not a trivial query" do
-          @request['IsTrivial'].should be_false
-        end
-
-        it 'has stores the recorded time in DurationMilliseconds' do
-          @request['DurationMilliseconds'].should == 1234
-        end
-        
-        it 'calculates DurationWithoutChildrenMilliseconds without the children timings' do
-          @request['DurationWithoutChildrenMilliseconds'].should == 123      
-        end
-
-      end
-
-    end
-
-
-  end
-
-
-end
diff --git a/lib/rack-mini-profiler/spec/components/sql_timer_struct_spec.rb b/lib/rack-mini-profiler/spec/components/sql_timer_struct_spec.rb
deleted file mode 100644
index a2cbaa94b..000000000
--- a/lib/rack-mini-profiler/spec/components/sql_timer_struct_spec.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-require 'spec_helper'
-require 'rack-mini-profiler'
-
-describe Rack::MiniProfiler::SqlTimerStruct do
-
-  describe 'valid sql timer' do
-    before do
-      @sql = Rack::MiniProfiler::SqlTimerStruct.new("SELECT * FROM users", 200, Rack::MiniProfiler::PageTimerStruct.new({}), nil)
-    end
-
-    it 'has an ExecuteType' do
-      @sql['ExecuteType'].should_not be_nil
-    end
-
-    it 'has a FormattedCommandString' do
-      @sql['FormattedCommandString'].should_not be_nil
-    end
-
-    it 'has a StackTraceSnippet' do
-      @sql['StackTraceSnippet'].should_not be_nil
-    end  
-
-    it 'has a StartMilliseconds' do
-      @sql['StartMilliseconds'].should_not be_nil
-    end   
-
-    it 'has a DurationMilliseconds' do
-      @sql['DurationMilliseconds'].should_not be_nil
-    end 
-
-    it 'has a IsDuplicate' do
-      @sql['IsDuplicate'].should_not be_nil
-    end       
-  end
-
-
-  
-  describe 'backtrace' do
-    it 'has a snippet' do
-      sql = Rack::MiniProfiler::SqlTimerStruct.new("SELECT * FROM users", 200, Rack::MiniProfiler::PageTimerStruct.new({}), nil)
-      sql['StackTraceSnippet'].should_not be nil
-    end
-
-    it 'includes rspec in the trace (default is no filter)' do
-      sql = Rack::MiniProfiler::SqlTimerStruct.new("SELECT * FROM users", 200, Rack::MiniProfiler::PageTimerStruct.new({}), nil)
-      sql['StackTraceSnippet'].should match /rspec/
-    end
-
-    it "doesn't include rspec if we filter for only app" do
-      Rack::MiniProfiler.config.backtrace_includes = [/\/app/]
-      sql = Rack::MiniProfiler::SqlTimerStruct.new("SELECT * FROM users", 200, Rack::MiniProfiler::PageTimerStruct.new({}), nil)
-      sql['StackTraceSnippet'].should_not match /rspec/
-    end
-
-    it "includes rspec if we filter for it" do
-      Rack::MiniProfiler.config.backtrace_includes = [/\/(app|rspec)/]
-      sql = Rack::MiniProfiler::SqlTimerStruct.new("SELECT * FROM users", 200, Rack::MiniProfiler::PageTimerStruct.new({}), nil)
-      sql['StackTraceSnippet'].should match /rspec/
-    end
-
-    it "ingores rspec if we specifically ignore it" do  
-      Rack::MiniProfiler.config.backtrace_ignores = [/\/rspec/]
-      sql = Rack::MiniProfiler::SqlTimerStruct.new("SELECT * FROM users", 200, Rack::MiniProfiler::PageTimerStruct.new({}), nil)
-      sql['StackTraceSnippet'].should_not match /rspec/
-    end
-
-    it "should omit the backtrace if the query takes less than the threshold time" do
-      Rack::MiniProfiler.config.backtrace_threshold_ms = 100
-      sql = Rack::MiniProfiler::SqlTimerStruct.new("SELECT * FROM users", 50, Rack::MiniProfiler::PageTimerStruct.new({}), nil)
-      sql['StackTraceSnippet'].should be nil
-    end
-
-    it "should not omit the backtrace if the query takes more than the threshold time" do
-      Rack::MiniProfiler.config.backtrace_threshold_ms = 100
-      sql = Rack::MiniProfiler::SqlTimerStruct.new("SELECT * FROM users", 200, Rack::MiniProfiler::PageTimerStruct.new({}), nil)
-      sql['StackTraceSnippet'].should_not be nil
-    end
-  end
-
-end
diff --git a/lib/rack-mini-profiler/spec/components/timer_struct_spec.rb b/lib/rack-mini-profiler/spec/components/timer_struct_spec.rb
deleted file mode 100644
index 795e429b3..000000000
--- a/lib/rack-mini-profiler/spec/components/timer_struct_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-require 'spec_helper'
-require 'mini_profiler/timer_struct'
-
-require 'json'
-
-describe Rack::MiniProfiler::TimerStruct do
-
-  before do
-    @timer = Rack::MiniProfiler::TimerStruct.new('Mini' => 'Profiler')
-  end
-
-  it 'has the the Mini attribute' do
-    @timer['Mini'].should == 'Profiler'
-  end
-
-  it 'allows us to set any attribute we want' do
-    @timer['Hello'] = 'World'
-    @timer['Hello'].should == 'World'
-  end
-
-  describe 'to_json' do
-
-    before do
-      @timer['IceIce'] = 'Baby'
-      @json = @timer.to_json
-    end
-
-    it 'has a JSON value' do
-      @json.should_not be_nil
-    end
-
-    it 'should not add a second (nil) argument if no arguments were passed' do
-      ::JSON.should_receive( :generate ).once.with( @timer.attributes, :max_nesting => 100 ).and_return( nil )
-      @timer.to_json
-    end
-
-    describe 'deserialized' do
-
-      before do
-        @deserialized = ::JSON.parse(@json)
-      end
-
-      it 'produces a hash' do
-        @deserialized.is_a?(Hash).should be_true
-      end
-
-      it 'has the element we added' do
-        @deserialized['IceIce'].should == 'Baby'
-      end
-    end
-
-  end
-
-end
diff --git a/lib/rack-mini-profiler/spec/fixtures/simple_client_request.yml b/lib/rack-mini-profiler/spec/fixtures/simple_client_request.yml
deleted file mode 100644
index 6797aa7fc..000000000
--- a/lib/rack-mini-profiler/spec/fixtures/simple_client_request.yml
+++ /dev/null
@@ -1,17 +0,0 @@
---- 
-rack.request.form_hash:
-  clientPerformance: 
-    navigation:
-      redirectCount: 1
-    timing: 
-      navigationStart: 1334245954
-      navigationEnd: 1334245970
-      simpleStart: 1334245955
-      simpleEnd: 1334245965
-  clientProbes:
-    0:
-      d: 1334245970
-      n: bob.js
-    1:
-      d: 1334245976
-      n: bob.js
diff --git a/lib/rack-mini-profiler/spec/fixtures/weird_client_request.yml b/lib/rack-mini-profiler/spec/fixtures/weird_client_request.yml
deleted file mode 100644
index 6cc680a16..000000000
--- a/lib/rack-mini-profiler/spec/fixtures/weird_client_request.yml
+++ /dev/null
@@ -1,14 +0,0 @@
---- 
-rack.request.form_hash:
-  clientProbes: ''
-  clientPerformance: 
-    navigation:
-      redirectCount: 99
-    timing: 
-      navigationStart: 1334245954
-      navigationEnd: 1334245970
-      weirdStart: 1334245965
-      weirdEnd: 1334245955
-      previousStart: 1334245950
-      previousEnd: 1334245952
-      differentFormat: 1334245955
diff --git a/lib/rack-mini-profiler/spec/integration/mini_profiler_spec.rb b/lib/rack-mini-profiler/spec/integration/mini_profiler_spec.rb
deleted file mode 100644
index e85094abc..000000000
--- a/lib/rack-mini-profiler/spec/integration/mini_profiler_spec.rb
+++ /dev/null
@@ -1,261 +0,0 @@
-require 'spec_helper'
-require 'rack-mini-profiler'
-require 'rack/test'
-
-describe Rack::MiniProfiler do
-  include Rack::Test::Methods
-
-  def app
-    @app ||= Rack::Builder.new {
-      use Rack::MiniProfiler
-      map '/path2/a' do
-        run lambda { |env| [200, {'Content-Type' => 'text/html'}, '<h1>path1</h1>'] }
-      end
-      map '/path1/a' do
-        run lambda { |env| [200, {'Content-Type' => 'text/html'}, '<h1>path2</h1>'] }
-      end
-      map '/post' do
-        run lambda { |env| [302, {'Content-Type' => 'text/html'}, '<h1>POST</h1>'] }
-      end
-      map '/html' do
-        run lambda { |env| [200, {'Content-Type' => 'text/html'}, "<html><BODY><h1>Hi</h1></BODY>\n \t</html>"] }
-      end
-      map '/implicitbody' do
-        run lambda { |env| [200, {'Content-Type' => 'text/html'}, "<html><h1>Hi</h1></html>"] }
-      end
-      map '/implicitbodyhtml' do
-        run lambda { |env| [200, {'Content-Type' => 'text/html'}, "<h1>Hi</h1>"] }
-      end
-      map '/db' do
-        run lambda { |env|
-          ::Rack::MiniProfiler.record_sql("I want to be, in a db", 10)
-          [200, {'Content-Type' => 'text/html'}, '<h1>Hi+db</h1>']
-        }
-      end
-      map '/3ms' do
-        run lambda { |env|
-          sleep(0.003)
-          [200, {'Content-Type' => 'text/html'}, '<h1>Hi</h1>']
-        }
-      end
-      map '/whitelisted' do
-        run lambda { |env|
-          Rack::MiniProfiler.authorize_request
-          [200, {'Content-Type' => 'text/html'}, '<h1>path1</h1>']
-        }
-      end
-    }.to_app
-  end
-
-  before do
-    Rack::MiniProfiler.reset_config
-  end
-
-  describe 'with a valid request' do
-
-    before do
-      get '/html'
-    end
-
-    it 'returns 200' do
-      last_response.should be_ok
-    end
-
-    it 'has the X-MiniProfiler-Ids header' do
-      last_response.headers.has_key?('X-MiniProfiler-Ids').should be_true
-    end
-
-    it 'has only one X-MiniProfiler-Ids header' do
-      h = last_response.headers['X-MiniProfiler-Ids']
-      ids = ::JSON.parse(h)
-      ids.count.should == 1
-    end
-
-    it 'has the JS in the body' do
-      last_response.body.include?('/mini-profiler-resources/includes.js').should be_true
-    end
-
-    it 'has a functioning share link' do
-      h = last_response.headers['X-MiniProfiler-Ids']
-      id = ::JSON.parse(h)[0]
-      get "/mini-profiler-resources/results?id=#{id}"
-      last_response.should be_ok
-    end
-
-    it 'avoids xss attacks' do
-      h = last_response.headers['X-MiniProfiler-Ids']
-      id = ::JSON.parse(h)[0]
-      get "/mini-profiler-resources/results?id=%22%3E%3Cqss%3E"
-      last_response.should_not be_ok
-      last_response.body.should_not =~ /<qss>/
-      last_response.body.should =~ /&lt;qss&gt;/
-    end
-  end
-
-
-  describe 'with an implicit body tag' do
-
-    before do
-      get '/implicitbody'
-    end
-
-    it 'has the JS in the body' do
-      last_response.body.include?('/mini-profiler-resources/includes.js').should be_true
-    end
-
-  end
-
-
-  describe 'with implicit body and html tags' do
-
-    before do
-      get '/implicitbodyhtml'
-    end
-
-    it 'does not include the JS in the body' do
-      last_response.body.include?('/mini-profiler-resources/includes.js').should be_false
-    end
-
-  end
-
-
-  describe 'with a SCRIPT_NAME' do
-
-    before do
-      get '/html', nil, 'SCRIPT_NAME' => '/test'
-    end
-
-    it 'has the JS in the body with the correct path' do
-      last_response.body.include?('/test/mini-profiler-resources/includes.js').should be_true
-    end
-
-  end
-
-  describe 'configuration' do
-    it "doesn't add MiniProfiler if the callback fails" do
-      Rack::MiniProfiler.config.pre_authorize_cb = lambda {|env| false }
-      get '/html'
-      last_response.headers.has_key?('X-MiniProfiler-Ids').should be_false
-    end
-
-    it "skips paths listed" do
-      Rack::MiniProfiler.config.skip_paths = ['/path/', '/path2/']
-      get '/path2/a'
-      last_response.headers.has_key?('X-MiniProfiler-Ids').should be_false
-      get '/path1/a'
-      last_response.headers.has_key?('X-MiniProfiler-Ids').should be_true
-    end
-
-    it 'disables default functionality' do
-      Rack::MiniProfiler.config.enabled = false
-      get '/html'
-      last_response.headers.has_key?('X-MiniProfiler-Ids').should be_false
-    end
-  end
-
-  def load_prof(response)
-    id = response.headers['X-MiniProfiler-Ids']
-    id = ::JSON.parse(id)[0]
-    Rack::MiniProfiler.config.storage_instance.load(id)
-  end
-
-  describe 'special options' do
-    it "omits db backtrace if requested" do
-      get '/db?pp=no-backtrace'
-      prof = load_prof(last_response)
-      stack = prof["Root"]["SqlTimings"][0]["StackTraceSnippet"]
-      stack.should be_nil
-    end
-
-    it 'disables functionality if requested' do
-      get '/html?pp=disable'
-      last_response.body.should_not include('/mini-profiler-resources/includes.js')
-    end
-
-    context 'when disabled' do
-      before(:each) do
-        get '/html?pp=disable'
-        get '/html'
-        last_response.body.should_not include('/mini-profiler-resources/includes.js')
-      end
-
-      it 're-enables functionality if requested' do
-        get '/html?pp=enable'
-        last_response.body.should include('/mini-profiler-resources/includes.js')
-      end
-
-      it "does not re-enable functionality if not whitelisted" do
-        Rack::MiniProfiler.config.authorization_mode = :whitelist
-        get '/html?pp=enable'
-        last_response.body.should_not include('/mini-profiler-resources/includes.js')
-      end
-
-      it "re-enabled functionality if whitelisted" do
-        Rack::MiniProfiler.config.authorization_mode = :whitelist
-        expect(Rack::MiniProfiler).to receive(:request_authorized?) { true }.twice
-        get '/html?pp=enable'
-        last_response.body.should include('/mini-profiler-resources/includes.js')
-      end
-    end
-  end
-
-  describe 'POST followed by GET' do
-    it "should end up with 2 ids" do
-      post '/post'
-      get '/html'
-
-      ids = last_response.headers['X-MiniProfiler-Ids']
-      ::JSON.parse(ids).length.should == 2
-    end
-  end
-
-  describe 'authorization mode whitelist' do
-    before do
-      Rack::MiniProfiler.config.authorization_mode = :whitelist
-    end
-
-    it "should ban requests that are not whitelisted" do
-      get '/html'
-      last_response.headers['X-MiniProfiler-Ids'].should be_nil
-    end
-
-    it "should allow requests that are whitelisted" do
-      set_cookie("__profilin=stylin")
-      get '/whitelisted'
-      last_response.headers['X-MiniProfiler-Ids'].should_not be_nil
-    end
-  end
-
-
-  describe 'gc profiler' do
-    it "should return a report" do
-      get '/html?pp=profile-gc'
-      last_response.header['Content-Type'].should == 'text/plain'
-    end
-  end
-
-  describe 'error handling when storage_instance fails to save' do
-    it "should recover gracefully" do
-      Rack::MiniProfiler.config.pre_authorize_cb = lambda {|env| true }
-      Rack::MiniProfiler::MemoryStore.any_instance.stub(:save) { raise "This error" }
-      Rack::MiniProfiler.config.storage_failure.should_receive(:call)
-      get '/html'
-    end
-  end
-
-  describe 'when profiler is disabled by default' do
-    before(:each) do
-      Rack::MiniProfiler.config.enabled = false
-      get '/html'
-      last_response.headers.has_key?('X-MiniProfiler-Ids').should be_false
-    end
-
-    it 'functionality can be re-enabled' do
-      get '/html?pp=enable'
-      last_response.headers.has_key?('X-MiniProfiler-Ids').should be_true
-      get '/html'
-      last_response.headers.has_key?('X-MiniProfiler-Ids').should be_true
-    end
-  end
-
-end
diff --git a/lib/rack-mini-profiler/spec/spec_helper.rb b/lib/rack-mini-profiler/spec/spec_helper.rb
deleted file mode 100644
index 555586604..000000000
--- a/lib/rack-mini-profiler/spec/spec_helper.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  config.color_enabled = true
-end
-
-class Time
-  class << self 
-    unless method_defined? :old_new
-      alias_method :old_new, :new
-      alias_method :old_now, :now
-    
-      def new
-        @now || old_new
-      end
-
-      def now
-        @now || old_now
-      end
-
-      def now=(v)
-        @now = v
-      end
-
-      def back_to_normal
-        @now = nil
-      end
-
-    end
-  end
-end
diff --git a/lib/rack-mini-profiler/spec/support/expand_each_to_matcher.rb b/lib/rack-mini-profiler/spec/support/expand_each_to_matcher.rb
deleted file mode 100644
index ac57b00e3..000000000
--- a/lib/rack-mini-profiler/spec/support/expand_each_to_matcher.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# This defines a matcher we can use to test the result of an each method on an object
-RSpec::Matchers.define :expand_each_to do |expected|  
-  match do |actual|
-    expanded = []
-    actual.each {|v| expanded << v}
-    expanded.should == expected
-  end
-end
\ No newline at end of file
diff --git a/lib/rack-mini-profiler/test_old/config.ru b/lib/rack-mini-profiler/test_old/config.ru
deleted file mode 100644
index d309b2506..000000000
--- a/lib/rack-mini-profiler/test_old/config.ru
+++ /dev/null
@@ -1,40 +0,0 @@
-#! rackup -
-#\ -w -p 8080 
-require 'active_support/inflector' # see https://code.google.com/p/ruby-sequel/issues/detail?id=329
-require 'sequel'
-require File.expand_path('../lib/rack-mini-profiler', File.dirname(__FILE__))
-
-require 'logger'
-use Rack::MiniProfiler
-options = {}
-options[:logger] = Logger.new(STDOUT)
-DB = Sequel.connect("mysql2://sveg:svegsveg@localhost/sveg_development", options)
-
-app = proc do |env|
-  sleep(0.1)
-  env['profiler.mini'].benchmark(env, "sleep0.2") do
-    sleep(0.2)
-  end
-  env['profiler.mini'].benchmark(env, 'sleep0.1') do
-    sleep(0.1)
-    env['profiler.mini'].benchmark(env, 'sleep0.01') do
-      sleep(0.01)
-      env['profiler.mini'].benchmark(env, 'sleep0.001') do
-        sleep(0.001)
-        DB.fetch('SHOW TABLES') do |row|
-          puts row
-        end
-      end
-      env['profiler.mini'].benchmark(env, 'litl sql') do
-        DB.fetch('select * from auth_logins') do |row|
-          puts row
-        end
-      end
-    end
-  end
-  [ 200, {'Content-Type' => 'text/html'}, ["<h1>This is Rack::MiniProfiler test"] ]
-end
-
-puts "Rack::MiniProfiler test"
-puts "http://localhost:8080/mini-profiler"
-run app
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 2fd0c6460..6a74b4d3c 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -119,6 +119,8 @@ Redmine::AccessControl.map do |map|
   map.permission :course_attachments_download,{:attachments => :download},:belong_to_course => true
   map.permission :contest_attachments_download,{:attachments => :download},:belong_to_contest => true
 
+  map.permission :view_homeworks, {}, :public => true, :read => true
+
   map.course_module :files do |map|
   #  map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin
     map.permission :view_course_files, {:files => :index, :versions => :download}, :read => true,:belong_to_course => true
@@ -480,6 +482,8 @@ Redmine::Activity.map do |activity|
   activity.register :course_journals_for_messages , :class_name => 'JournalsForMessage'
   activity.register :course_news, :class_name => 'News'
   activity.register :course_messages, :default => false, :class_name => 'Message'
+
+  activity.register :homeworks, :class_name => 'Bid'
 end
 
 Redmine::Search.map do |search|
diff --git a/lib/seems_rateable/Gemfile b/lib/seems_rateable/Gemfile
deleted file mode 100644
index a1025271a..000000000
--- a/lib/seems_rateable/Gemfile
+++ /dev/null
@@ -1,23 +0,0 @@
-source "https://rubygems.org"
-
-# Declare your gem's dependencies in seems_rateable.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
-gemspec
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
-# To use debugger
-# gem 'debugger'
-
-
-group :development do
-  gem 'sqlite3'
-  gem 'jquery-rails'
-  gem 'twitter-bootstrap-rails'
-  gem 'sorcery'
-end
-
diff --git a/lib/seems_rateable/MIT-LICENSE b/lib/seems_rateable/MIT-LICENSE
deleted file mode 100644
index 5146945d9..000000000
--- a/lib/seems_rateable/MIT-LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright 2013 YOURNAME
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/seems_rateable/README.md b/lib/seems_rateable/README.md
deleted file mode 100644
index aacc7407b..000000000
--- a/lib/seems_rateable/README.md
+++ /dev/null
@@ -1,111 +0,0 @@
-# SeemsRateable
-
-Star rating gem for Rails application using jQuery plugin <a href="http://www.myjqueryplugins.com/jquery-plugin/jrating">jRating</a>
-
-## Demo
-
-<a href="http://rateable.herokuapp.com/">Demo</a> application, requires to sign up before rating
-
-## Instructions
-
-### Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'seems_rateable'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install seems_rateable
-
-### Generation
-
-	$ rails generate seems_rateable:install
-	
-Generator creates migration files, javascript files and initializer
-
-### Prepare
-
-Require javascript files by adding this line to application.js
-
-	#application.js
-	//= require_directory ./rateable
-
-Add <code>seems_rateable</code> to routes.rb file
-
-Include stylesheet adding <code><%= seems_rateable_stylesheet %></code> to your layout header
-
-Also make sure you have an existing <code>current_user</code> helper method	
-
-Don't forget to run
-
-	$ rake db:migrate
-
-To prepare model add <code> seems_rateable </code> to your rateable model file. You can also pass a hash of options to
-customize the functionality
-
-<ul>
-<li><code>:dimensions</code>Array of dimensions e.g <code>:dimensions => [:quality, :quantity]</code> </li>
-<li><code>:allow_update</code>Allowing user to re-rate his own ratings, default set to false e.g <code>:allow_update=> true</code></li>
-</ul>
-
-	class Post < ActiveRecord::Base
-		seems_rateable :allow_update => true, :dimensions => [:quality, :length]
-	end
-
-To access object's rates use <code>rates</code> method, to get dimension rates pass an argument eg :
-
-	@object.rates
-	@object.rates(:quality)
-	@object.rates(:quantity)
-	
-This also applies to cached average rating e.g
-
-	@object.average	
-	@object.average(:quality)
-	@object.average(:quantity)
-	
-And to object's raters e.g
-	
-	@object.raters
-	@object.raters(:quality)
-	@object.raters(:quantity)
-	
-To track user's given ratings add <code>seems_rateable_rater</code> to your rater model.
-If your rater class is not "User"(e.g "Client" or "Customer") change configuration in initializer generated by this engine.
-Now you can access user's ratings by <code>@user.ratings_given</code>
-
-### Usage
-
-To display star rating use helper method <code>rating_for</code> in your view
-
-    #index.html.erb
-
-    rating_for @post
-
-    rating_for @post, :dimension => :quality, :class => 'post', :id => 'list'
-
-    rating_for @post, :static => true
-
-You can specify these options :
-<ul>
-<li><code>:dimension</code>The dimension of the object</li>
-<li><code>:static</code>Set to true to display static star rating, default false</li>
-<li><code>:class</code>Class of the div, default set to 'rateable'</li>
-<li><code>:id</code>ID of the div e.g <code>:id => "info"</code>, default nil</li>
-</ul>
-
-To edit the javascript options locate rateable.js file in /app/assets/javascripts/rateable/.
-The javascript options are explained directly in the file    	
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
diff --git a/lib/seems_rateable/Rakefile b/lib/seems_rateable/Rakefile
deleted file mode 100644
index cc267251e..000000000
--- a/lib/seems_rateable/Rakefile
+++ /dev/null
@@ -1,17 +0,0 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'SeemsRateable'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-Bundler::GemHelper.install_tasks
diff --git a/lib/seems_rateable/app/assets/images/seems_rateable/bg_jRatingInfos.png b/lib/seems_rateable/app/assets/images/seems_rateable/bg_jRatingInfos.png
deleted file mode 100644
index af5bf556e..000000000
Binary files a/lib/seems_rateable/app/assets/images/seems_rateable/bg_jRatingInfos.png and /dev/null differ
diff --git a/lib/seems_rateable/app/assets/images/seems_rateable/small.png b/lib/seems_rateable/app/assets/images/seems_rateable/small.png
deleted file mode 100644
index de1826f59..000000000
Binary files a/lib/seems_rateable/app/assets/images/seems_rateable/small.png and /dev/null differ
diff --git a/lib/seems_rateable/app/assets/images/seems_rateable/stars.png b/lib/seems_rateable/app/assets/images/seems_rateable/stars.png
deleted file mode 100644
index 2df62b026..000000000
Binary files a/lib/seems_rateable/app/assets/images/seems_rateable/stars.png and /dev/null differ
diff --git a/lib/seems_rateable/app/assets/javascripts/seems_rateable/application.js b/lib/seems_rateable/app/assets/javascripts/seems_rateable/application.js
deleted file mode 100644
index 806c8cc06..000000000
--- a/lib/seems_rateable/app/assets/javascripts/seems_rateable/application.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-// about supported directives.
-
-//= require_tree .
-
-
diff --git a/lib/seems_rateable/app/assets/stylesheets/seems_rateable/application.css b/lib/seems_rateable/app/assets/stylesheets/seems_rateable/application.css
deleted file mode 100644
index aeb6475f3..000000000
--- a/lib/seems_rateable/app/assets/stylesheets/seems_rateable/application.css
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require_tree .
- */
-
-/*********************/
-/** jRating CSS **/
-/*********************/
-
-/**Div containing the color of the stars */
-
-
-.jRatingAverage {
-  background-color:#f62929;
-  position:relative;
-  top:0;
-  left:0;
-  z-index:2;
-  height:100%;
-}
-.jRatingColor {
-  background-color:#FFD400; /* bgcolor of the stars*/
-  position:relative;
-  top:0;
-  left:0;
-  z-index:2;
-  height:100%;
-}
-
-/** Div containing the stars **/
-.jStar {
-  position:relative;
-  left:0;
-  z-index:3;
-}
-
-/** P containing the rate informations **/
-p.jRatingInfos {
-  position:   absolute;
-  z-index:9999;
-  background: transparent url('bg_jRatingInfos.png') no-repeat;
-  color:      #CACACA;
-  display:    none;
-  width:      91px;
-  height:     29px; 
-  font-size:16px;
-  text-align:center;
-  padding-top:5px;
-}
-p.jRatingInfos span.maxRate {
-  color:#c9c9c9;
-  font-size:14px;
-}
diff --git a/lib/seems_rateable/app/controllers/seems_rateable/application_controller.rb b/lib/seems_rateable/app/controllers/seems_rateable/application_controller.rb
deleted file mode 100644
index 7f0af9fc5..000000000
--- a/lib/seems_rateable/app/controllers/seems_rateable/application_controller.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module SeemsRateable
-  class ApplicationController < ::ApplicationController
-    rescue_from SeemsRateable::Errors::AlreadyRatedError do |exception|
-      render :json => {:error => true}
-    end
-  end
-end
diff --git a/lib/seems_rateable/app/controllers/seems_rateable/ratings_controller.rb b/lib/seems_rateable/app/controllers/seems_rateable/ratings_controller.rb
deleted file mode 100644
index 4c8758f08..000000000
--- a/lib/seems_rateable/app/controllers/seems_rateable/ratings_controller.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require_dependency "seems_rateable/application_controller"
-
-module SeemsRateable
-  class RatingsController < ApplicationController
-    def create
-      raise Errors::NoCurrentUserInstanceError unless current_user
-      obj = params[:kls].classify.constantize.find(params[:idBox])
-      obj.rate(params[:rate].to_i, current_user.id, params[:dimension])
-  
-      render :json => true
-
-    rescue Errors::NoCurrentUserInstanceError
-      render :json => {:error => 'you must be login.'}
-    end
-  end
-end
diff --git a/lib/seems_rateable/app/models/seems_rateable/cached_rating.rb b/lib/seems_rateable/app/models/seems_rateable/cached_rating.rb
deleted file mode 100644
index c48ff0734..000000000
--- a/lib/seems_rateable/app/models/seems_rateable/cached_rating.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module SeemsRateable
-  class CachedRating < ActiveRecord::Base
-    belongs_to :cacheable, :polymorphic => true
-  end
-end
diff --git a/lib/seems_rateable/app/models/seems_rateable/rate.rb b/lib/seems_rateable/app/models/seems_rateable/rate.rb
deleted file mode 100644
index 8259ca1e7..000000000
--- a/lib/seems_rateable/app/models/seems_rateable/rate.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module SeemsRateable
-  class Rate < ActiveRecord::Base
-    belongs_to :rater, :class_name => SeemsRateable::Engine.config.owner_class
-    belongs_to :rateable, :polymorphic => true
-  end
-end
diff --git a/lib/seems_rateable/bin/rails b/lib/seems_rateable/bin/rails
deleted file mode 100644
index 773450b9c..000000000
--- a/lib/seems_rateable/bin/rails
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby1.9.1
-# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/seems_rateable/engine', __FILE__)
-
-require 'rails/all'
-require 'rails/engine/commands'
diff --git a/lib/seems_rateable/config/routes.rb b/lib/seems_rateable/config/routes.rb
deleted file mode 100644
index 4191f5460..000000000
--- a/lib/seems_rateable/config/routes.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-SeemsRateable::Engine.routes.draw do
-  resources :ratings, :only => :create
-end
diff --git a/lib/seems_rateable/lib/generators/seems_rateable/install/install_generator.rb b/lib/seems_rateable/lib/generators/seems_rateable/install/install_generator.rb
deleted file mode 100644
index 613bdac72..000000000
--- a/lib/seems_rateable/lib/generators/seems_rateable/install/install_generator.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'rails/generators/migration'
-require 'fileutils'
-
-module SeemsRateable
-  module Generators
-    class InstallGenerator < ::Rails::Generators::Base
-      include Rails::Generators::Migration
-      source_root File.expand_path('../templates', __FILE__)
-  
-      def self.next_migration_number(path)
-        unless @prev_migration_nr
-          @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-        else
-          @prev_migration_nr += 1
-        end
-      @prev_migration_nr.to_s
-      end
-      
-      def routegen
-        route("seems_rateable")
-      end
-      
-      desc "generating migration files"
-      def copy_migrations
-        migration_template "rates_migration.rb", "db/migrate/create_seems_rateable_rates.rb"
-        migration_template "cached_ratings_migration.rb", "db/migrate/create_seems_rateable_cached_ratings.rb"
-      end
-      
-      desc "generating initializer"
-      def copy_initializer
-        template "initializer.rb", "config/initializers/seems_rateable.rb"
-      end
-      
-      desc "generating javascript files"
-      def copy_javascript_asset
-        Dir.mkdir "app/assets/javascripts/rateable" unless File.directory?("app/assets/javascripts/rateable")
-        copy_file "rateable.js.erb", "app/assets/javascripts/rateable/rateable.js.erb" unless File.exists?("app/assets/javascripts/rateable/rateable.js.erb")
-        copy_file "jRating.js.erb", "app/assets/javascripts/rateable/jRating.js.erb" unless File.exists?("app/assets/javascripts/rateable/jRating.js.erb")
-      end
-    end
-  end
-end
diff --git a/lib/seems_rateable/lib/generators/seems_rateable/install/templates/cached_ratings_migration.rb b/lib/seems_rateable/lib/generators/seems_rateable/install/templates/cached_ratings_migration.rb
deleted file mode 100644
index e3e7ab2ee..000000000
--- a/lib/seems_rateable/lib/generators/seems_rateable/install/templates/cached_ratings_migration.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class CreateSeemsRateableCachedRatings < ActiveRecord::Migration
-  def self.up
-    create_table :seems_rateable_cached_ratings do |t|
-      t.belongs_to :cacheable, :polymorphic => true
-      t.float :avg, :null => false
-      t.integer :cnt, :null => false
-      t.string :dimension
-      t.integer :cacheable_id, :limit => 8
-      t.string :cacheable_type
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :cached_ratings
-  end
-end
diff --git a/lib/seems_rateable/lib/generators/seems_rateable/install/templates/initializer.rb b/lib/seems_rateable/lib/generators/seems_rateable/install/templates/initializer.rb
deleted file mode 100644
index 2391948fa..000000000
--- a/lib/seems_rateable/lib/generators/seems_rateable/install/templates/initializer.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-#SeemsRateable engine Initializer
-
-#Configure owner class of the given ratings
-SeemsRateable::Engine.config.owner_class = "User"
diff --git a/lib/seems_rateable/lib/generators/seems_rateable/install/templates/jRating.js.erb b/lib/seems_rateable/lib/generators/seems_rateable/install/templates/jRating.js.erb
deleted file mode 100644
index b5b778889..000000000
--- a/lib/seems_rateable/lib/generators/seems_rateable/install/templates/jRating.js.erb
+++ /dev/null
@@ -1,225 +0,0 @@
-/************************************************************************
-*************************************************************************
-@Name :       	jRating - jQuery Plugin
-@Revison :    	3.0
-@Date : 		28/01/2013 
-@Author:     	 ALPIXEL - (www.myjqueryplugins.com - www.alpixel.fr) 
-@License :		 Open Source - MIT License : http://www.opensource.org/licenses/mit-license.php
- 
-**************************************************************************
-*************************************************************************/
-(function($) {
-	$.fn.jRating = function(op) {
-		var defaults = {
-			/** String vars **/
-			bigStarsPath : 'images/seems_rateable/stars.png', // path of the icon stars.png
-			smallStarsPath : 'images/seems_rateable/small.png', // path of the icon small.png
-			path : '/ratings',
-			type : 'big', // can be set to 'small' or 'big'
-
-			/** Boolean vars **/
-			step:false, // if true,  mouseover binded star by star,
-			isDisabled:false,
-			showRateInfo: false,
-			canRateAgain : false,
-
-			/** Integer vars **/
-			length:5, // number of star to display
-			decimalLength : 0, // number of decimals.. Max 3, but you can complete the function 'getNote'
-			rateMax : 20, // maximal rate - integer from 0 to 9999 (or more)
-			rateInfosX : -45, // relative position in X axis of the info box when mouseover
-			rateInfosY : 5, // relative position in Y axis of the info box when mouseover
-			nbRates : 1,
-
-			/** Functions **/
-			onSuccess : null,
-			onError : null
-		}; 
-
-		if(this.length>0)
-		return this.each(function() {
-			/*vars*/
-			var opts = $.extend(defaults, op),    
-			newWidth = 0,
-			starWidth = 0,
-			starHeight = 0,
-			bgPath = '',
-			hasRated = false,
-			globalWidth = 0,
-			nbOfRates = opts.nbRates;
-
-			if($(this).hasClass('jDisabled') || opts.isDisabled)
-				var jDisabled = true;
-			else
-				var jDisabled = false;
-
-			getStarWidth();
-			$(this).height(starHeight);
-			
-			
-			
-			var average = parseFloat($(this).attr('data-average')), // get the average of all rates
-			idBox = parseInt($(this).attr('data-id')), // get the id of the box
-			kls = $(this).attr('data-kls'),
-			dimension = $(this).attr('data-dimension'),
-			widthRatingContainer = starWidth*opts.length, // Width of the Container
-			widthColor = average/opts.rateMax*widthRatingContainer, // Width of the color Container
-			quotient = 
-			$('<div>', 
-			{
-				'class' : 'jRatingColor',
-				css:{
-					width:widthColor
-				}
-			}).appendTo($(this)),
-
-			average = 
-			$('<div>', 
-			{
-				'class' : 'jRatingAverage',
-				css:{
-					width:0,
-					top:- starHeight
-				}
-			}).appendTo($(this)),
-
-			 jstar =
-			$('<div>', 
-			{
-				'class' : 'jStar',
-				css:{
-					width:widthRatingContainer,
-					height:starHeight,
-					top:- (starHeight*2),
-					background: 'url('+bgPath+') repeat-x'
-				}
-			}).appendTo($(this));
-			
-			$(this).css({width: widthRatingContainer,overflow:'hidden',zIndex:1,position:'relative'});
-			
-			if(!jDisabled)
-			$(this).unbind().bind({
-				mouseenter : function(e){
-					var realOffsetLeft = findRealLeft(this);
-					var relativeX = e.pageX - realOffsetLeft;
-					if (opts.showRateInfo)
-					var tooltip = 
-					$('<p>',{
-						'class' : 'jRatingInfos',
-						html : getNote(relativeX)+' <span class="maxRate">/ '+opts.rateMax+'</span>',
-						css : {
-							top: (e.pageY + opts.rateInfosY),
-							left: (e.pageX + opts.rateInfosX)
-						}
-					}).appendTo('body').show();
-				},
-				mouseover : function(e){
-					$(this).css('cursor','pointer');	
-				},
-				mouseout : function(){
-					$(this).css('cursor','default');
-					if(hasRated) average.width(globalWidth);
-					else average.width(0);
-				},
-				mousemove : function(e){
-					var realOffsetLeft = findRealLeft(this);
-					var relativeX = e.pageX - realOffsetLeft;
-					if(opts.step) newWidth = Math.floor(relativeX/starWidth)*starWidth + starWidth;
-					else newWidth = relativeX;
-					average.width(newWidth);					
-					if (opts.showRateInfo)
-					$("p.jRatingInfos")
-					.css({
-						left: (e.pageX + opts.rateInfosX)
-					})
-					.html(getNote(newWidth) +' <span class="maxRate">/ '+opts.rateMax+'</span>');
-				},
-				mouseleave : function(){
-					$("p.jRatingInfos").remove();
-				},
-				click : function(e){
-                    var element = this;
-					
-					/*set vars*/
-					hasRated = true;
-					globalWidth = newWidth;
-					nbOfRates--;
-					
-					if(!opts.canRateAgain || parseInt(nbOfRates) <= 0) $(this).unbind().css('cursor','default').addClass('jDisabled');
-					
-					if (opts.showRateInfo) $("p.jRatingInfos").fadeOut('fast',function(){$(this).remove();});
-					e.preventDefault();
-					var rate = getNote(newWidth);
-					average.width(newWidth);
-					
-
-					$.post(defaults.path,
-						{
-							idBox : idBox,
-							rate : rate,
-							kls : kls,
-							dimension : dimension
-						/**	action : 'rating' **/
-						},
-						function(data) {
-							if(!data.error)
-							{
-								/** Here you can display an alert box, 
-									or use the jNotify Plugin :) http://www.myqjqueryplugins.com/jNotify
-									exemple :	*/
-								if(opts.onSuccess) opts.onSuccess( element, rate );
-							}
-							else
-							{
-
-								/** Here you can display an alert box, 
-									or use the jNotify Plugin :) http://www.myqjqueryplugins.com/jNotify
-									exemple :	*/
-								if(opts.onError) opts.onError( element, rate );
-							}
-						},
-						'json'
-					);
-				}
-			});
-
-			function getNote(relativeX) {
-				var noteBrut = parseFloat((relativeX*100/widthRatingContainer)*opts.rateMax/100);
-				switch(opts.decimalLength) {
-					case 1 :
-						var note = Math.round(noteBrut*10)/10;
-						break;
-					case 2 :
-						var note = Math.round(noteBrut*100)/100;
-						break;
-					case 3 :
-						var note = Math.round(noteBrut*1000)/1000;
-						break;
-					default :
-						var note = Math.round(noteBrut*1)/1;
-				}
-				return note;
-			};
-			
-			function getStarWidth(){
-				switch(opts.type) {
-					case 'small' :
-						starWidth = 12; // width of the picture small.png
-						starHeight = 10; // height of the picture small.png
-						bgPath = opts.smallStarsPath;
-					break;
-					default :
-						starWidth = 23; // width of the picture stars.png
-						starHeight = 20; // height of the picture stars.png
-						bgPath = opts.bigStarsPath;
-				}
-			};
-
-			function findRealLeft(obj) {
-			  if( !obj ) return 0;
-			  return obj.offsetLeft + findRealLeft( obj.offsetParent );
-			};
-		});
-
-	}
-})(jQuery);
diff --git a/lib/seems_rateable/lib/generators/seems_rateable/install/templates/rateable.js.erb b/lib/seems_rateable/lib/generators/seems_rateable/install/templates/rateable.js.erb
deleted file mode 100644
index e926601d2..000000000
--- a/lib/seems_rateable/lib/generators/seems_rateable/install/templates/rateable.js.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-$(document).ready(function(){
-      $(".rateable").jRating({		
-		//default options displayed below ->
-			
-			rateMax: 5,			//Maximal rate
-         length : 5,    		//Number of stars
-         //decimalLength : 0,    //Number of decimals in the rate
-         //type : 'big',  		//Big or small
-         //step : true, 		//If set to true, filling of the stars is done star by star (step by step).
-         //isDisabled: false,   //Set true to display static rating
-         //showRateInfo:false,   //Rate info panel, set true to display
-         //rateInfosX : 45,		//In pixel - Absolute left position of the information box during mousemove.
-         //rateInfosY : 5,		//In pixel - Absolute top position of the information box during mousemove.
-         path : '/ratings',
-         onSuccess : function(element, rate){
-				//something like ->
-				//alert('success');
-				$('<span class="text-success"><small style="display:inline-block;">Thanks for rating!</small></span>').insertAfter(element)
-         },
-         onError : function(element, rate) {
-				$('<span class="text-error"><small style="display:inline-block;">You have already rated!</small></span>').insertAfter(element)
-			}
-       });
-
-});
diff --git a/lib/seems_rateable/lib/generators/seems_rateable/install/templates/rates_migration.rb b/lib/seems_rateable/lib/generators/seems_rateable/install/templates/rates_migration.rb
deleted file mode 100644
index 21990b0ad..000000000
--- a/lib/seems_rateable/lib/generators/seems_rateable/install/templates/rates_migration.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class CreateSeemsRateableRates < ActiveRecord::Migration
-  def self.up
-    create_table :seems_rateable_rates do |t|
-      t.belongs_to :rater
-      t.belongs_to :rateable, :polymorphic => true
-      t.float :stars, :null => false
-      t.integer :rater_id, :limit => 8
-      t.integer :rateable_id
-      t.string :rateable_type
-      t.string :dimension
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :rates
-  end
-end
diff --git a/lib/seems_rateable/lib/seems_rateable.rb b/lib/seems_rateable/lib/seems_rateable.rb
deleted file mode 100644
index 2939d773f..000000000
--- a/lib/seems_rateable/lib/seems_rateable.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-begin
-  require 'rails'
-rescue LoadError
-end
-
-require "jquery-rails"
-
-require "seems_rateable/engine"
-require "seems_rateable/errors"
-require "seems_rateable/helpers"
-require "seems_rateable/model"
-require "seems_rateable/routes"
-require "seems_rateable/version"
-
-module SeemsRateable
-end
diff --git a/lib/seems_rateable/lib/seems_rateable/engine.rb b/lib/seems_rateable/lib/seems_rateable/engine.rb
deleted file mode 100644
index f32ccb929..000000000
--- a/lib/seems_rateable/lib/seems_rateable/engine.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-module SeemsRateable
-  class Engine < ::Rails::Engine
-    isolate_namespace SeemsRateable
-
-    config.generators do |g|
-      g.test_framework :rspec, :fixture => false
-      g.fixture_replacement :factory_girl, :dir => 'spec/factories'
-    end
-
-    initializer :seems_rateable do
-      ActiveRecord::Base.send :include, SeemsRateable::Model
-      ActionView::Base.send :include, SeemsRateable::Helpers
-      ActionDispatch::Routing::Mapper.send :include, SeemsRateable::Routes
-    end
-  end
-end
diff --git a/lib/seems_rateable/lib/seems_rateable/errors.rb b/lib/seems_rateable/lib/seems_rateable/errors.rb
deleted file mode 100644
index 9fcb0c380..000000000
--- a/lib/seems_rateable/lib/seems_rateable/errors.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module SeemsRateable
-  module Errors
-    class InvalidRateableObjectError < StandardError
-      def to_s
-        "Stated object is not rateable. Add 'seems_rateable' to your object's class model."
-      end
-    end
-    
-    class NoCurrentUserInstanceError < StandardError
-      def to_s
-        "User instance current_user is not available."
-      end
-    end
-    
-    class AlreadyRatedError < StandardError
-      def to_s
-        "User has already rated an object."
-      end
-    end 
-  end
-end
diff --git a/lib/seems_rateable/lib/seems_rateable/helpers.rb b/lib/seems_rateable/lib/seems_rateable/helpers.rb
deleted file mode 100644
index a0da7d0c9..000000000
--- a/lib/seems_rateable/lib/seems_rateable/helpers.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module SeemsRateable
-  module Helpers      
-    def rating_for(obj, opts={})
-      raise Errors::InvalidRateableObjectError unless obj.class.respond_to?(:rateable?)
-      
-      options = {
-        :dimension => nil,
-        :static => false,
-        :class => 'rateable',
-        :id => nil,
-        :start_score => nil
-      }.update(opts)
-            
-      content_tag :div, "", "data-average" => options[:start_score].nil? ? (obj.average(options[:dimension]) ? obj.average(options[:dimension]).avg : 0):options[:start_score], :id => options[:id],
-        :class => "#{options[:class]}#{jdisabled?(options[:static])}",
-        "data-id" => obj.id, "data-kls" => obj.class.name, "data-dimension" => options[:dimension]
-    end
-    
-    def seems_rateable_stylesheet
-      stylesheet_link_tag    "seems_rateable/application", media: "all", "data-turbolinks-track" => true
-    end
-    
-    private
-    def jdisabled?(option)
-      " jDisabled" if option || !current_user
-    end
-  end
-end
diff --git a/lib/seems_rateable/lib/seems_rateable/model.rb b/lib/seems_rateable/lib/seems_rateable/model.rb
deleted file mode 100644
index b4ebbb196..000000000
--- a/lib/seems_rateable/lib/seems_rateable/model.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-require 'active_support/concern'
-
-module SeemsRateable
-  module Model
-    extend ActiveSupport::Concern
-
-    def rate(stars, user_id, dimension=nil)
-      if !has_rated?(user_id, dimension)
-        self.rates.create do |r|
-          r.stars = stars
-          r.rater_id = user_id
-          r.dimension = dimension
-        end
-        update_overall_average_rating(stars, dimension)
-      elsif has_rated?(user_id, dimension) && can_update?
-        update_users_rating(stars, user_id, dimension)
-      else
-        raise Errors::AlreadyRatedError
-      end
-    end
-
-    def update_overall_average_rating(stars, dimension=nil)
-      r = average(dimension)
-      if r.nil?
-        self.rate_averages.create do |r|
-          r.avg = stars
-          r.dimension = dimension
-          r.cnt = 1
-        end
-      else
-        r.avg = (r.avg * r.cnt + stars) / (r.cnt+1)
-        r.cnt += 1
-        r.save!
-        r
-      end
-    end
-
-    def update_users_rating(stars, user_id, dimension=nil)
-      obj = rates(dimension).where(:rater_id => user_id).first
-      current_record = average(dimension)
-      current_record.avg = (current_record.avg*current_record.cnt - obj.stars + stars) / (current_record.cnt)
-      current_record.save!
-      obj.stars = stars
-      obj.save!
-    end
-
-
-    def average(dimension=nil)
-      rate_averages.where(dimension: dimension).first
-    end
-
-    def rates(dimension=nil)
-      rates_all.where(dimension: dimension)
-    end
-
-    def raters(dimension=nil)
-      raters_all.where('seems_rateable_rates.dimension = ?', dimension)
-    end
-
-    def has_rated?(user_id, dimension=nil)
-      record = self.rates(dimension).where(:rater_id => user_id)
-      record.empty? ? false : true
-    end
-
-    def can_update?
-      self.class.can_update?
-    end
-
-    module ClassMethods
-      def seems_rateable(opts={})
-        has_many :rates_all, :as => :rateable, :class_name => SeemsRateable::Rate, :dependent => :destroy
-        has_many :raters_all, :through => :rates_all, :class_name => SeemsRateable::Engine.config.owner_class, :source => :rater
-        has_many :rate_averages, :as => :cacheable, :class_name => SeemsRateable::CachedRating, :dependent => :destroy
-
-        self.class_variable_set(:@@permission, opts[:allow_update] ? true : false)
-
-        def self.can_update?
-          self.class_variable_get(:@@permission)
-        end
-
-        def self.rateable?
-          true
-        end
-      end
-
-      def seems_rateable_rater
-        has_many :ratings_given, :class_name => SeemsRateable::Rate, :foreign_key => :rater_id
-      end
-    end
-  end
-end
diff --git a/lib/seems_rateable/lib/seems_rateable/routes.rb b/lib/seems_rateable/lib/seems_rateable/routes.rb
deleted file mode 100644
index 81a243339..000000000
--- a/lib/seems_rateable/lib/seems_rateable/routes.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module SeemsRateable
-  module Routes
-    def seems_rateable
-      mount SeemsRateable::Engine => '/rateable', :as => :rateable
-    end
-  end
-end
diff --git a/lib/seems_rateable/lib/seems_rateable/version.rb b/lib/seems_rateable/lib/seems_rateable/version.rb
deleted file mode 100644
index 8a635c656..000000000
--- a/lib/seems_rateable/lib/seems_rateable/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module SeemsRateable
-  VERSION = "1.0.13"
-end
diff --git a/lib/seems_rateable/seems_rateable.gemspec b/lib/seems_rateable/seems_rateable.gemspec
deleted file mode 100644
index b4f32a9fc..000000000
--- a/lib/seems_rateable/seems_rateable.gemspec
+++ /dev/null
@@ -1,25 +0,0 @@
-$:.push File.expand_path("../lib", __FILE__)
-
-# Maintain your gem's version:
-require "seems_rateable/version"
-
-# Describe your gem and declare its dependencies:
-Gem::Specification.new do |s|
-  s.name        = "seems_rateable"
-  s.version     = SeemsRateable::VERSION
-  s.authors     = ["Peter Toth"]
-  s.email       = ["proximin@gmail.com"]
-  s.homepage    = "http://rateable.herokuapp.com"
-  s.summary     = "Star Rating Engine"
-  s.description = "Star rating engine using jQuery plugin jRating for Rails applications"
-
-  s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
-
-  s.add_dependency "rails"
-  s.add_dependency "jquery-rails"
-
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency 'rspec-rails'
-  s.add_development_dependency 'capybara'
-  s.add_development_dependency 'factory_girl_rails'
-end
diff --git a/lib/tasks/git_post_update.rake b/lib/tasks/git_post_update.rake
new file mode 100644
index 000000000..9dd6357f3
--- /dev/null
+++ b/lib/tasks/git_post_update.rake
@@ -0,0 +1,37 @@
+namespace :git_post_update do
+
+  HOOK_TEMPLATE = %Q{#!/bin/sh
+exec sh -c '
+function update()
+{
+        CMD_PATH=`dirname $0`;
+        cd $CMD_PATH;
+        PY_PATH=$PWD/../../git_refresh_changes.py;
+        [[ -s "$PY_PATH"   ]] && $(which python) $PY_PATH $PWD;
+        cd -;
+}
+git update-server-info
+update
+'
+  }
+
+  desc "update old post-update file, REP_PATH"
+  task :update_old_file do
+    raise "please set REP_PATH" unless ENV["REP_PATH"]
+    Dir.chdir(ENV["REP_PATH"]) do
+      Dir.glob("**/post-update").each do |filename|
+        File.open(filename, "w+") do |f|
+          f.write(HOOK_TEMPLATE)
+          puts " file #{filename} changed"
+        end
+      end
+    end
+  end
+
+  desc "disabled auto change refresh."
+  task :disable_refresh_changes => :environment do
+    Setting.find(44).tap{|s| s.value=0; s.save}
+  end
+
+
+end
\ No newline at end of file
diff --git a/plugins/redmine_ckeditor/Gemfile b/plugins/redmine_ckeditor/Gemfile
index 5071abd08..2a2862162 100644
--- a/plugins/redmine_ckeditor/Gemfile
+++ b/plugins/redmine_ckeditor/Gemfile
@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source 'http://ruby.taobao.org'
 
 gem 'rich', '1.4.6'
 gem 'kaminari'
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
new file mode 100644
index 000000000..e58e4b2be
--- /dev/null
+++ b/public/assets/kindeditor/kindeditor.js
@@ -0,0 +1,5963 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2013 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @website http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+* @version 4.1.10 (2013-11-23)
+*******************************************************************************/
+(function (window, undefined) {
+	if (window.KindEditor) {
+		return;
+	}
+if (!window.console) {
+	window.console = {};
+}
+if (!console.log) {
+	console.log = function () {};
+}
+var _VERSION = '4.1.10 (2013-11-23)',
+	_ua = navigator.userAgent.toLowerCase(),
+	_IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1,
+	_NEWIE = _ua.indexOf('msie') == -1 && _ua.indexOf('trident') > -1,
+	_GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1,
+	_WEBKIT = _ua.indexOf('applewebkit') > -1,
+	_OPERA = _ua.indexOf('opera') > -1,
+	_MOBILE = _ua.indexOf('mobile') > -1,
+	_IOS = /ipad|iphone|ipod/.test(_ua),
+	_QUIRKS = document.compatMode != 'CSS1Compat',
+	_IERANGE = !window.getSelection,
+	_matches = /(?:msie|firefox|webkit|opera)[\/:\s](\d+)/.exec(_ua),
+	_V = _matches ? _matches[1] : '0',
+	_TIME = new Date().getTime();
+function _isArray(val) {
+	if (!val) {
+		return false;
+	}
+	return Object.prototype.toString.call(val) === '[object Array]';
+}
+function _isFunction(val) {
+	if (!val) {
+		return false;
+	}
+	return Object.prototype.toString.call(val) === '[object Function]';
+}
+function _inArray(val, arr) {
+	for (var i = 0, len = arr.length; i < len; i++) {
+		if (val === arr[i]) {
+			return i;
+		}
+	}
+	return -1;
+}
+function _each(obj, fn) {
+	if (_isArray(obj)) {
+		for (var i = 0, len = obj.length; i < len; i++) {
+			if (fn.call(obj[i], i, obj[i]) === false) {
+				break;
+			}
+		}
+	} else {
+		for (var key in obj) {
+			if (obj.hasOwnProperty(key)) {
+				if (fn.call(obj[key], key, obj[key]) === false) {
+					break;
+				}
+			}
+		}
+	}
+}
+function _trim(str) {
+	return str.replace(/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g, '');
+}
+function _inString(val, str, delimiter) {
+	delimiter = delimiter === undefined ? ',' : delimiter;
+	return (delimiter + str + delimiter).indexOf(delimiter + val + delimiter) >= 0;
+}
+function _addUnit(val, unit) {
+	unit = unit || 'px';
+	return val && /^\d+$/.test(val) ? val + unit : val;
+}
+function _removeUnit(val) {
+	var match;
+	return val && (match = /(\d+)/.exec(val)) ? parseInt(match[1], 10) : 0;
+}
+function _escape(val) {
+	return val.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+}
+function _unescape(val) {
+	return val.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&amp;/g, '&');
+}
+function _toCamel(str) {
+	var arr = str.split('-');
+	str = '';
+	_each(arr, function(key, val) {
+		str += (key > 0) ? val.charAt(0).toUpperCase() + val.substr(1) : val;
+	});
+	return str;
+}
+function _toHex(val) {
+	function hex(d) {
+		var s = parseInt(d, 10).toString(16).toUpperCase();
+		return s.length > 1 ? s : '0' + s;
+	}
+	return val.replace(/rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/ig,
+		function($0, $1, $2, $3) {
+			return '#' + hex($1) + hex($2) + hex($3);
+		}
+	);
+}
+function _toMap(val, delimiter) {
+	delimiter = delimiter === undefined ? ',' : delimiter;
+	var map = {}, arr = _isArray(val) ? val : val.split(delimiter), match;
+	_each(arr, function(key, val) {
+		if ((match = /^(\d+)\.\.(\d+)$/.exec(val))) {
+			for (var i = parseInt(match[1], 10); i <= parseInt(match[2], 10); i++) {
+				map[i.toString()] = true;
+			}
+		} else {
+			map[val] = true;
+		}
+	});
+	return map;
+}
+function _toArray(obj, offset) {
+	return Array.prototype.slice.call(obj, offset || 0);
+}
+function _undef(val, defaultVal) {
+	return val === undefined ? defaultVal : val;
+}
+function _invalidUrl(url) {
+	return !url || /[<>"]/.test(url);
+}
+function _addParam(url, param) {
+	return url.indexOf('?') >= 0 ? url + '&' + param : url + '?' + param;
+}
+function _extend(child, parent, proto) {
+	if (!proto) {
+		proto = parent;
+		parent = null;
+	}
+	var childProto;
+	if (parent) {
+		var fn = function () {};
+		fn.prototype = parent.prototype;
+		childProto = new fn();
+		_each(proto, function(key, val) {
+			childProto[key] = val;
+		});
+	} else {
+		childProto = proto;
+	}
+	childProto.constructor = child;
+	child.prototype = childProto;
+	child.parent = parent ? parent.prototype : null;
+}
+function _json(text) {
+	var match;
+	if ((match = /\{[\s\S]*\}|\[[\s\S]*\]/.exec(text))) {
+		text = match[0];
+	}
+	var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+	cx.lastIndex = 0;
+	if (cx.test(text)) {
+		text = text.replace(cx, function (a) {
+			return '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+		});
+	}
+	if (/^[\],:{}\s]*$/.
+	test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
+	replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
+	replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+		return eval('(' + text + ')');
+	}
+	throw 'JSON parse error';
+}
+var _round = Math.round;
+var K = {
+	DEBUG : false,
+	VERSION : _VERSION,
+	IE : _IE,
+	GECKO : _GECKO,
+	WEBKIT : _WEBKIT,
+	OPERA : _OPERA,
+	V : _V,
+	TIME : _TIME,
+	each : _each,
+	isArray : _isArray,
+	isFunction : _isFunction,
+	inArray : _inArray,
+	inString : _inString,
+	trim : _trim,
+	addUnit : _addUnit,
+	removeUnit : _removeUnit,
+	escape : _escape,
+	unescape : _unescape,
+	toCamel : _toCamel,
+	toHex : _toHex,
+	toMap : _toMap,
+	toArray : _toArray,
+	undef : _undef,
+	invalidUrl : _invalidUrl,
+	addParam : _addParam,
+	extend : _extend,
+	json : _json
+};
+var _INLINE_TAG_MAP = _toMap('a,abbr,acronym,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,img,input,ins,kbd,label,map,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var'),
+	_BLOCK_TAG_MAP = _toMap('address,applet,blockquote,body,center,dd,dir,div,dl,dt,fieldset,form,frameset,h1,h2,h3,h4,h5,h6,head,hr,html,iframe,ins,isindex,li,map,menu,meta,noframes,noscript,object,ol,p,pre,script,style,table,tbody,td,tfoot,th,thead,title,tr,ul'),
+	_SINGLE_TAG_MAP = _toMap('area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed'),
+	_STYLE_TAG_MAP = _toMap('b,basefont,big,del,em,font,i,s,small,span,strike,strong,sub,sup,u'),
+	_CONTROL_TAG_MAP = _toMap('img,table,input,textarea,button'),
+	_PRE_TAG_MAP = _toMap('pre,style,script'),
+	_NOSPLIT_TAG_MAP = _toMap('html,head,body,td,tr,table,ol,ul,li'),
+	_AUTOCLOSE_TAG_MAP = _toMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'),
+	_FILL_ATTR_MAP = _toMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'),
+	_VALUE_TAG_MAP = _toMap('input,button,textarea,select');
+// Begining of modification by Macrow
+function _getBasePath() {
+	var refPath = '/assets/kindeditor/';
+	var els = document.getElementsByTagName('script'), src;
+	for (var i = 0, len = els.length; i < len; i++) {
+		src = els[i].src || '';
+		if (/(kindeditor|application)[\w\-\.]*\.js/.test(src)) {
+			return src.substring(0, src.indexOf('assets')) + refPath;
+		}
+	}
+	return refPath;
+}
+// End of modification by Macrow
+K.basePath = _getBasePath();
+K.options = {
+	designMode : true,
+	fullscreenMode : false,
+	filterMode : true,
+	wellFormatMode : true,
+	shadowMode : true,
+	loadStyleMode : true,
+	basePath : K.basePath,
+	themesPath : K.basePath + 'themes/',
+	langPath : K.basePath + 'lang/',
+	pluginsPath : K.basePath + 'plugins/',
+	themeType : 'default',
+	langType : 'zh_CN',
+	urlType : '',
+	newlineTag : 'p',
+	resizeType : 2,
+	syncType : 'form',
+	pasteType : 2,
+	dialogAlignType : 'page',
+	useContextmenu : true,
+	fullscreenShortcut : false,
+	bodyClass : 'ke-content',
+	indentChar : '\t',
+	cssPath : '',
+	cssData : '',
+	minWidth : 650,
+	minHeight : 100,
+	minChangeSize : 50,
+	zIndex : 811213,
+	items : [
+		'source', '|', 'undo', 'redo', '|', 'preview', 'print', 'template', 'code', 'cut', 'copy', 'paste',
+		'plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright',
+		'justifyfull', 'insertorderedlist', 'insertunorderedlist', 'indent', 'outdent', 'subscript',
+		'superscript', 'clearhtml', 'quickformat', 'selectall', '|', 'fullscreen', '/',
+		'formatblock', 'fontname', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
+		'italic', 'underline', 'strikethrough', 'lineheight', 'removeformat', '|', 'image', 'multiimage',
+		'flash', 'media', 'insertfile', 'table', 'hr', 'emoticons', 'baidumap', 'pagebreak',
+		'anchor', 'link', 'unlink', '|', 'about'
+	],
+	noDisableItems : ['source', 'fullscreen'],
+	colorTable : [
+		['#E53333', '#E56600', '#FF9900', '#64451D', '#DFC5A4', '#FFE500'],
+		['#009900', '#006600', '#99BB00', '#B8D100', '#60D978', '#00D5FF'],
+		['#337FE5', '#003399', '#4C33E5', '#9933E5', '#CC33E5', '#EE33EE'],
+		['#FFFFFF', '#CCCCCC', '#999999', '#666666', '#333333', '#000000']
+	],
+	fontSizeTable : ['9px', '10px', '12px', '14px', '16px', '18px', '24px', '32px'],
+	htmlTags : {
+		font : ['id', 'class', 'color', 'size', 'face', '.background-color'],
+		span : [
+			'id', 'class', '.color', '.background-color', '.font-size', '.font-family', '.background',
+			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.line-height'
+		],
+		div : [
+			'id', 'class', 'align', '.border', '.margin', '.padding', '.text-align', '.color',
+			'.background-color', '.font-size', '.font-family', '.font-weight', '.background',
+			'.font-style', '.text-decoration', '.vertical-align', '.margin-left'
+		],
+		table: [
+			'id', 'class', 'border', 'cellspacing', 'cellpadding', 'width', 'height', 'align', 'bordercolor',
+			'.padding', '.margin', '.border', 'bgcolor', '.text-align', '.color', '.background-color',
+			'.font-size', '.font-family', '.font-weight', '.font-style', '.text-decoration', '.background',
+			'.width', '.height', '.border-collapse'
+		],
+		'td,th': [
+			'id', 'class', 'align', 'valign', 'width', 'height', 'colspan', 'rowspan', 'bgcolor',
+			'.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight',
+			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border'
+		],
+		a : ['id', 'class', 'href', 'target', 'name'],
+		embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+		img : ['id', 'class', 'src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
+		'p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : [
+			'id', 'class', 'align', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.background',
+			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.text-indent', '.margin-left'
+		],
+		pre : ['id', 'class'],
+		hr : ['id', 'class', '.page-break-after'],
+		'br,tbody,tr,strong,b,sub,sup,em,i,u,strike,s,del' : ['id', 'class'],
+		iframe : ['id', 'class', 'src', 'frameborder', 'width', 'height', '.width', '.height']
+	},
+	layout : '<div class="container"><div class="toolbar"></div><div class="edit"></div><div class="statusbar"></div></div>'
+};
+var _useCapture = false;
+var _INPUT_KEY_MAP = _toMap('8,9,13,32,46,48..57,59,61,65..90,106,109..111,188,190..192,219..222');
+var _CURSORMOVE_KEY_MAP = _toMap('33..40');
+var _CHANGE_KEY_MAP = {};
+_each(_INPUT_KEY_MAP, function(key, val) {
+	_CHANGE_KEY_MAP[key] = val;
+});
+_each(_CURSORMOVE_KEY_MAP, function(key, val) {
+	_CHANGE_KEY_MAP[key] = val;
+});
+function _bindEvent(el, type, fn) {
+	if (el.addEventListener){
+		el.addEventListener(type, fn, _useCapture);
+	} else if (el.attachEvent){
+		el.attachEvent('on' + type, fn);
+	}
+}
+function _unbindEvent(el, type, fn) {
+	if (el.removeEventListener){
+		el.removeEventListener(type, fn, _useCapture);
+	} else if (el.detachEvent){
+		el.detachEvent('on' + type, fn);
+	}
+}
+var _EVENT_PROPS = ('altKey,attrChange,attrName,bubbles,button,cancelable,charCode,clientX,clientY,ctrlKey,currentTarget,' +
+	'data,detail,eventPhase,fromElement,handler,keyCode,metaKey,newValue,offsetX,offsetY,originalTarget,pageX,' +
+	'pageY,prevValue,relatedNode,relatedTarget,screenX,screenY,shiftKey,srcElement,target,toElement,view,wheelDelta,which').split(',');
+function KEvent(el, event) {
+	this.init(el, event);
+}
+_extend(KEvent, {
+	init : function(el, event) {
+		var self = this, doc = el.ownerDocument || el.document || el;
+		self.event = event;
+		_each(_EVENT_PROPS, function(key, val) {
+			self[val] = event[val];
+		});
+		if (!self.target) {
+			self.target = self.srcElement || doc;
+		}
+		if (self.target.nodeType === 3) {
+			self.target = self.target.parentNode;
+		}
+		if (!self.relatedTarget && self.fromElement) {
+			self.relatedTarget = self.fromElement === self.target ? self.toElement : self.fromElement;
+		}
+		if (self.pageX == null && self.clientX != null) {
+			var d = doc.documentElement, body = doc.body;
+			self.pageX = self.clientX + (d && d.scrollLeft || body && body.scrollLeft || 0) - (d && d.clientLeft || body && body.clientLeft || 0);
+			self.pageY = self.clientY + (d && d.scrollTop  || body && body.scrollTop  || 0) - (d && d.clientTop  || body && body.clientTop  || 0);
+		}
+		if (!self.which && ((self.charCode || self.charCode === 0) ? self.charCode : self.keyCode)) {
+			self.which = self.charCode || self.keyCode;
+		}
+		if (!self.metaKey && self.ctrlKey) {
+			self.metaKey = self.ctrlKey;
+		}
+		if (!self.which && self.button !== undefined) {
+			self.which = (self.button & 1 ? 1 : (self.button & 2 ? 3 : (self.button & 4 ? 2 : 0)));
+		}
+		switch (self.which) {
+		case 186 :
+			self.which = 59;
+			break;
+		case 187 :
+		case 107 :
+		case 43 :
+			self.which = 61;
+			break;
+		case 189 :
+		case 45 :
+			self.which = 109;
+			break;
+		case 42 :
+			self.which = 106;
+			break;
+		case 47 :
+			self.which = 111;
+			break;
+		case 78 :
+			self.which = 110;
+			break;
+		}
+		if (self.which >= 96 && self.which <= 105) {
+			self.which -= 48;
+		}
+	},
+	preventDefault : function() {
+		var ev = this.event;
+		if (ev.preventDefault) {
+			ev.preventDefault();
+		} else {
+			ev.returnValue = false;
+		}
+	},
+	stopPropagation : function() {
+		var ev = this.event;
+		if (ev.stopPropagation) {
+			ev.stopPropagation();
+		} else {
+			ev.cancelBubble = true;
+		}
+	},
+	stop : function() {
+		this.preventDefault();
+		this.stopPropagation();
+	}
+});
+var _eventExpendo = 'kindeditor_' + _TIME, _eventId = 0, _eventData = {};
+function _getId(el) {
+	return el[_eventExpendo] || null;
+}
+function _setId(el) {
+	el[_eventExpendo] = ++_eventId;
+	return _eventId;
+}
+function _removeId(el) {
+	try {
+		delete el[_eventExpendo];
+	} catch(e) {
+		if (el.removeAttribute) {
+			el.removeAttribute(_eventExpendo);
+		}
+	}
+}
+function _bind(el, type, fn) {
+	if (type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_bind(el, this, fn);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		id = _setId(el);
+	}
+	if (_eventData[id] === undefined) {
+		_eventData[id] = {};
+	}
+	var events = _eventData[id][type];
+	if (events && events.length > 0) {
+		_unbindEvent(el, type, events[0]);
+	} else {
+		_eventData[id][type] = [];
+		_eventData[id].el = el;
+	}
+	events = _eventData[id][type];
+	if (events.length === 0) {
+		events[0] = function(e) {
+			var kevent = e ? new KEvent(el, e) : undefined;
+			_each(events, function(i, event) {
+				if (i > 0 && event) {
+					event.call(el, kevent);
+				}
+			});
+		};
+	}
+	if (_inArray(fn, events) < 0) {
+		events.push(fn);
+	}
+	_bindEvent(el, type, events[0]);
+}
+function _unbind(el, type, fn) {
+	if (type && type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_unbind(el, this, fn);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		return;
+	}
+	if (type === undefined) {
+		if (id in _eventData) {
+			_each(_eventData[id], function(key, events) {
+				if (key != 'el' && events.length > 0) {
+					_unbindEvent(el, key, events[0]);
+				}
+			});
+			delete _eventData[id];
+			_removeId(el);
+		}
+		return;
+	}
+	if (!_eventData[id]) {
+		return;
+	}
+	var events = _eventData[id][type];
+	if (events && events.length > 0) {
+		if (fn === undefined) {
+			_unbindEvent(el, type, events[0]);
+			delete _eventData[id][type];
+		} else {
+			_each(events, function(i, event) {
+				if (i > 0 && event === fn) {
+					events.splice(i, 1);
+				}
+			});
+			if (events.length == 1) {
+				_unbindEvent(el, type, events[0]);
+				delete _eventData[id][type];
+			}
+		}
+		var count = 0;
+		_each(_eventData[id], function() {
+			count++;
+		});
+		if (count < 2) {
+			delete _eventData[id];
+			_removeId(el);
+		}
+	}
+}
+function _fire(el, type) {
+	if (type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_fire(el, this);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		return;
+	}
+	var events = _eventData[id][type];
+	if (_eventData[id] && events && events.length > 0) {
+		events[0]();
+	}
+}
+function _ctrl(el, key, fn) {
+	var self = this;
+	key = /^\d{2,}$/.test(key) ? key : key.toUpperCase().charCodeAt(0);
+	_bind(el, 'keydown', function(e) {
+		if (e.ctrlKey && e.which == key && !e.shiftKey && !e.altKey) {
+			fn.call(el);
+			e.stop();
+		}
+	});
+}
+var _readyFinished = false;
+function _ready(fn) {
+	if (_readyFinished) {
+		fn(KindEditor);
+		return;
+	}
+	var loaded = false;
+	function readyFunc() {
+		if (!loaded) {
+			loaded = true;
+			fn(KindEditor);
+			_readyFinished = true;
+		}
+	}
+	function ieReadyFunc() {
+		if (!loaded) {
+			try {
+				document.documentElement.doScroll('left');
+			} catch(e) {
+				setTimeout(ieReadyFunc, 100);
+				return;
+			}
+			readyFunc();
+		}
+	}
+	function ieReadyStateFunc() {
+		if (document.readyState === 'complete') {
+			readyFunc();
+		}
+	}
+	if (document.addEventListener) {
+		_bind(document, 'DOMContentLoaded', readyFunc);
+	} else if (document.attachEvent) {
+		_bind(document, 'readystatechange', ieReadyStateFunc);
+		var toplevel = false;
+		try {
+			toplevel = window.frameElement == null;
+		} catch(e) {}
+		if (document.documentElement.doScroll && toplevel) {
+			ieReadyFunc();
+		}
+	}
+	_bind(window, 'load', readyFunc);
+}
+if (_IE) {
+	window.attachEvent('onunload', function() {
+		_each(_eventData, function(key, events) {
+			if (events.el) {
+				_unbind(events.el);
+			}
+		});
+	});
+}
+K.ctrl = _ctrl;
+K.ready = _ready;
+function _getCssList(css) {
+	var list = {},
+		reg = /\s*([\w\-]+)\s*:([^;]*)(;|$)/g,
+		match;
+	while ((match = reg.exec(css))) {
+		var key = _trim(match[1].toLowerCase()),
+			val = _trim(_toHex(match[2]));
+		list[key] = val;
+	}
+	return list;
+}
+function _getAttrList(tag) {
+	var list = {},
+		reg = /\s+(?:([\w\-:]+)|(?:([\w\-:]+)=([^\s"'<>]+))|(?:([\w\-:"]+)="([^"]*)")|(?:([\w\-:"]+)='([^']*)'))(?=(?:\s|\/|>)+)/g,
+		match;
+	while ((match = reg.exec(tag))) {
+		var key = (match[1] || match[2] || match[4] || match[6]).toLowerCase(),
+			val = (match[2] ? match[3] : (match[4] ? match[5] : match[7])) || '';
+		list[key] = val;
+	}
+	return list;
+}
+function _addClassToTag(tag, className) {
+	if (/\s+class\s*=/.test(tag)) {
+		tag = tag.replace(/(\s+class=["']?)([^"']*)(["']?[\s>])/, function($0, $1, $2, $3) {
+			if ((' ' + $2 + ' ').indexOf(' ' + className + ' ') < 0) {
+				return $2 === '' ? $1 + className + $3 : $1 + $2 + ' ' + className + $3;
+			} else {
+				return $0;
+			}
+		});
+	} else {
+		tag = tag.substr(0, tag.length - 1) + ' class="' + className + '">';
+	}
+	return tag;
+}
+function _formatCss(css) {
+	var str = '';
+	_each(_getCssList(css), function(key, val) {
+		str += key + ':' + val + ';';
+	});
+	return str;
+}
+function _formatUrl(url, mode, host, pathname) {
+	mode = _undef(mode, '').toLowerCase();
+	if (url.substr(0, 5) != 'data:') {
+		url = url.replace(/([^:])\/\//g, '$1/');
+	}
+	if (_inArray(mode, ['absolute', 'relative', 'domain']) < 0) {
+		return url;
+	}
+	host = host || location.protocol + '//' + location.host;
+	if (pathname === undefined) {
+		var m = location.pathname.match(/^(\/.*)\//);
+		pathname = m ? m[1] : '';
+	}
+	var match;
+	if ((match = /^(\w+:\/\/[^\/]*)/.exec(url))) {
+		if (match[1] !== host) {
+			return url;
+		}
+	} else if (/^\w+:/.test(url)) {
+		return url;
+	}
+	function getRealPath(path) {
+		var parts = path.split('/'), paths = [];
+		for (var i = 0, len = parts.length; i < len; i++) {
+			var part = parts[i];
+			if (part == '..') {
+				if (paths.length > 0) {
+					paths.pop();
+				}
+			} else if (part !== '' && part != '.') {
+				paths.push(part);
+			}
+		}
+		return '/' + paths.join('/');
+	}
+	if (/^\//.test(url)) {
+		url = host + getRealPath(url.substr(1));
+	} else if (!/^\w+:\/\//.test(url)) {
+		url = host + getRealPath(pathname + '/' + url);
+	}
+	function getRelativePath(path, depth) {
+		if (url.substr(0, path.length) === path) {
+			var arr = [];
+			for (var i = 0; i < depth; i++) {
+				arr.push('..');
+			}
+			var prefix = '.';
+			if (arr.length > 0) {
+				prefix += '/' + arr.join('/');
+			}
+			if (pathname == '/') {
+				prefix += '/';
+			}
+			return prefix + url.substr(path.length);
+		} else {
+			if ((match = /^(.*)\//.exec(path))) {
+				return getRelativePath(match[1], ++depth);
+			}
+		}
+	}
+	if (mode === 'relative') {
+		url = getRelativePath(host + pathname, 0).substr(2);
+	} else if (mode === 'absolute') {
+		if (url.substr(0, host.length) === host) {
+			url = url.substr(host.length);
+		}
+	}
+	return url;
+}
+function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) {
+	if (html == null) {
+		html = '';
+	}
+	urlType = urlType || '';
+	wellFormatted = _undef(wellFormatted, false);
+	indentChar = _undef(indentChar, '\t');
+	var fontSizeList = 'xx-small,x-small,small,medium,large,x-large,xx-large'.split(',');
+	html = html.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig, function($0, $1, $2, $3) {
+		return $1 + $2.replace(/<(?:br|br\s[^>]*)>/ig, '\n') + $3;
+	});
+	html = html.replace(/<(?:br|br\s[^>]*)\s*\/?>\s*<\/p>/ig, '</p>');
+	html = html.replace(/(<(?:p|p\s[^>]*)>)\s*(<\/p>)/ig, '$1<br />$2');
+	html = html.replace(/\u200B/g, '');
+	html = html.replace(/\u00A9/g, '&copy;');
+	html = html.replace(/\u00AE/g, '&reg;');
+	html = html.replace(/<[^>]+/g, function($0) {
+		return $0.replace(/\s+/g, ' ');
+	});
+	var htmlTagMap = {};
+	if (htmlTags) {
+		_each(htmlTags, function(key, val) {
+			var arr = key.split(',');
+			for (var i = 0, len = arr.length; i < len; i++) {
+				htmlTagMap[arr[i]] = _toMap(val);
+			}
+		});
+		if (!htmlTagMap.script) {
+			html = html.replace(/(<(?:script|script\s[^>]*)>)([\s\S]*?)(<\/script>)/ig, '');
+		}
+		if (!htmlTagMap.style) {
+			html = html.replace(/(<(?:style|style\s[^>]*)>)([\s\S]*?)(<\/style>)/ig, '');
+		}
+	}
+	var re = /(\s*)<(\/)?([\w\-:]+)((?:\s+|(?:\s+[\w\-:]+)|(?:\s+[\w\-:]+=[^\s"'<>]+)|(?:\s+[\w\-:"]+="[^"]*")|(?:\s+[\w\-:"]+='[^']*'))*)(\/)?>(\s*)/g;
+	var tagStack = [];
+	html = html.replace(re, function($0, $1, $2, $3, $4, $5, $6) {
+		var full = $0,
+			startNewline = $1 || '',
+			startSlash = $2 || '',
+			tagName = $3.toLowerCase(),
+			attr = $4 || '',
+			endSlash = $5 ? ' ' + $5 : '',
+			endNewline = $6 || '';
+		if (htmlTags && !htmlTagMap[tagName]) {
+			return '';
+		}
+		if (endSlash === '' && _SINGLE_TAG_MAP[tagName]) {
+			endSlash = ' /';
+		}
+		if (_INLINE_TAG_MAP[tagName]) {
+			if (startNewline) {
+				startNewline = ' ';
+			}
+			if (endNewline) {
+				endNewline = ' ';
+			}
+		}
+		if (_PRE_TAG_MAP[tagName]) {
+			if (startSlash) {
+				endNewline = '\n';
+			} else {
+				startNewline = '\n';
+			}
+		}
+		if (wellFormatted && tagName == 'br') {
+			endNewline = '\n';
+		}
+		if (_BLOCK_TAG_MAP[tagName] && !_PRE_TAG_MAP[tagName]) {
+			if (wellFormatted) {
+				if (startSlash && tagStack.length > 0 && tagStack[tagStack.length - 1] === tagName) {
+					tagStack.pop();
+				} else {
+					tagStack.push(tagName);
+				}
+				startNewline = '\n';
+				endNewline = '\n';
+				for (var i = 0, len = startSlash ? tagStack.length : tagStack.length - 1; i < len; i++) {
+					startNewline += indentChar;
+					if (!startSlash) {
+						endNewline += indentChar;
+					}
+				}
+				if (endSlash) {
+					tagStack.pop();
+				} else if (!startSlash) {
+					endNewline += indentChar;
+				}
+			} else {
+				startNewline = endNewline = '';
+			}
+		}
+		if (attr !== '') {
+			var attrMap = _getAttrList(full);
+			if (tagName === 'font') {
+				var fontStyleMap = {}, fontStyle = '';
+				_each(attrMap, function(key, val) {
+					if (key === 'color') {
+						fontStyleMap.color = val;
+						delete attrMap[key];
+					}
+					if (key === 'size') {
+						fontStyleMap['font-size'] = fontSizeList[parseInt(val, 10) - 1] || '';
+						delete attrMap[key];
+					}
+					if (key === 'face') {
+						fontStyleMap['font-family'] = val;
+						delete attrMap[key];
+					}
+					if (key === 'style') {
+						fontStyle = val;
+					}
+				});
+				if (fontStyle && !/;$/.test(fontStyle)) {
+					fontStyle += ';';
+				}
+				_each(fontStyleMap, function(key, val) {
+					if (val === '') {
+						return;
+					}
+					if (/\s/.test(val)) {
+						val = "'" + val + "'";
+					}
+					fontStyle += key + ':' + val + ';';
+				});
+				attrMap.style = fontStyle;
+			}
+			_each(attrMap, function(key, val) {
+				if (_FILL_ATTR_MAP[key]) {
+					attrMap[key] = key;
+				}
+				if (_inArray(key, ['src', 'href']) >= 0) {
+					attrMap[key] = _formatUrl(val, urlType);
+				}
+				if (htmlTags && key !== 'style' && !htmlTagMap[tagName]['*'] && !htmlTagMap[tagName][key] ||
+					tagName === 'body' && key === 'contenteditable' ||
+					/^kindeditor_\d+$/.test(key)) {
+					delete attrMap[key];
+				}
+				if (key === 'style' && val !== '') {
+					var styleMap = _getCssList(val);
+					_each(styleMap, function(k, v) {
+						if (htmlTags && !htmlTagMap[tagName].style && !htmlTagMap[tagName]['.' + k]) {
+							delete styleMap[k];
+						}
+					});
+					var style = '';
+					_each(styleMap, function(k, v) {
+						style += k + ':' + v + ';';
+					});
+					attrMap.style = style;
+				}
+			});
+			attr = '';
+			_each(attrMap, function(key, val) {
+				if (key === 'style' && val === '') {
+					return;
+				}
+				val = val.replace(/"/g, '&quot;');
+				attr += ' ' + key + '="' + val + '"';
+			});
+		}
+		if (tagName === 'font') {
+			tagName = 'span';
+		}
+		return startNewline + '<' + startSlash + tagName + attr + endSlash + '>' + endNewline;
+	});
+	html = html.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig, function($0, $1, $2, $3) {
+		return $1 + $2.replace(/\n/g, '<span id="__kindeditor_pre_newline__">\n') + $3;
+	});
+	html = html.replace(/\n\s*\n/g, '\n');
+	html = html.replace(/<span id="__kindeditor_pre_newline__">\n/g, '\n');
+	return _trim(html);
+}
+function _clearMsWord(html, htmlTags) {
+	html = html.replace(/<meta[\s\S]*?>/ig, '')
+		.replace(/<![\s\S]*?>/ig, '')
+		.replace(/<style[^>]*>[\s\S]*?<\/style>/ig, '')
+		.replace(/<script[^>]*>[\s\S]*?<\/script>/ig, '')
+		.replace(/<w:[^>]+>[\s\S]*?<\/w:[^>]+>/ig, '')
+		.replace(/<o:[^>]+>[\s\S]*?<\/o:[^>]+>/ig, '')
+		.replace(/<xml>[\s\S]*?<\/xml>/ig, '')
+		.replace(/<(?:table|td)[^>]*>/ig, function(full) {
+			return full.replace(/border-bottom:([#\w\s]+)/ig, 'border:$1');
+		});
+	return _formatHtml(html, htmlTags);
+}
+function _mediaType(src) {
+	if (/\.(rm|rmvb)(\?|$)/i.test(src)) {
+		return 'audio/x-pn-realaudio-plugin';
+	}
+	if (/\.(swf|flv)(\?|$)/i.test(src)) {
+		return 'application/x-shockwave-flash';
+	}
+	return 'video/x-ms-asf-plugin';
+}
+function _mediaClass(type) {
+	if (/realaudio/i.test(type)) {
+		return 'ke-rm';
+	}
+	if (/flash/i.test(type)) {
+		return 'ke-flash';
+	}
+	return 'ke-media';
+}
+function _mediaAttrs(srcTag) {
+	return _getAttrList(unescape(srcTag));
+}
+function _mediaEmbed(attrs) {
+	var html = '<embed ';
+	_each(attrs, function(key, val) {
+		html += key + '="' + val + '" ';
+	});
+	html += '/>';
+	return html;
+}
+function _mediaImg(blankPath, attrs) {
+	var width = attrs.width,
+		height = attrs.height,
+		type = attrs.type || _mediaType(attrs.src),
+		srcTag = _mediaEmbed(attrs),
+		style = '';
+	if (/\D/.test(width)) {
+		style += 'width:' + width + ';';
+	} else if (width > 0) {
+		style += 'width:' + width + 'px;';
+	}
+	if (/\D/.test(height)) {
+		style += 'height:' + height + ';';
+	} else if (height > 0) {
+		style += 'height:' + height + 'px;';
+	}
+	var html = '<img class="' + _mediaClass(type) + '" src="' + blankPath + '" ';
+	if (style !== '') {
+		html += 'style="' + style + '" ';
+	}
+	html += 'data-ke-tag="' + escape(srcTag) + '" alt="" />';
+	return html;
+}
+function _tmpl(str, data) {
+	var fn = new Function("obj",
+		"var p=[],print=function(){p.push.apply(p,arguments);};" +
+		"with(obj){p.push('" +
+		str.replace(/[\r\t\n]/g, " ")
+			.split("<%").join("\t")
+			.replace(/((^|%>)[^\t]*)'/g, "$1\r")
+			.replace(/\t=(.*?)%>/g, "',$1,'")
+			.split("\t").join("');")
+			.split("%>").join("p.push('")
+			.split("\r").join("\\'") + "');}return p.join('');");
+	return data ? fn(data) : fn;
+}
+K.formatUrl = _formatUrl;
+K.formatHtml = _formatHtml;
+K.getCssList = _getCssList;
+K.getAttrList = _getAttrList;
+K.mediaType = _mediaType;
+K.mediaAttrs = _mediaAttrs;
+K.mediaEmbed = _mediaEmbed;
+K.mediaImg = _mediaImg;
+K.clearMsWord = _clearMsWord;
+K.tmpl = _tmpl;
+function _contains(nodeA, nodeB) {
+	if (nodeA.nodeType == 9 && nodeB.nodeType != 9) {
+		return true;
+	}
+	while ((nodeB = nodeB.parentNode)) {
+		if (nodeB == nodeA) {
+			return true;
+		}
+	}
+	return false;
+}
+var _getSetAttrDiv = document.createElement('div');
+_getSetAttrDiv.setAttribute('className', 't');
+var _GET_SET_ATTRIBUTE = _getSetAttrDiv.className !== 't';
+function _getAttr(el, key) {
+	key = key.toLowerCase();
+	var val = null;
+	if (!_GET_SET_ATTRIBUTE && el.nodeName.toLowerCase() != 'script') {
+		var div = el.ownerDocument.createElement('div');
+		div.appendChild(el.cloneNode(false));
+		var list = _getAttrList(_unescape(div.innerHTML));
+		if (key in list) {
+			val = list[key];
+		}
+	} else {
+		try {
+			val = el.getAttribute(key, 2);
+		} catch(e) {
+			val = el.getAttribute(key, 1);
+		}
+	}
+	if (key === 'style' && val !== null) {
+		val = _formatCss(val);
+	}
+	return val;
+}
+function _queryAll(expr, root) {
+	var exprList = expr.split(',');
+	if (exprList.length > 1) {
+		var mergedResults = [];
+		_each(exprList, function() {
+			_each(_queryAll(this, root), function() {
+				if (_inArray(this, mergedResults) < 0) {
+					mergedResults.push(this);
+				}
+			});
+		});
+		return mergedResults;
+	}
+	root = root || document;
+	function escape(str) {
+		if (typeof str != 'string') {
+			return str;
+		}
+		return str.replace(/([^\w\-])/g, '\\$1');
+	}
+	function stripslashes(str) {
+		return str.replace(/\\/g, '');
+	}
+	function cmpTag(tagA, tagB) {
+		return tagA === '*' || tagA.toLowerCase() === escape(tagB.toLowerCase());
+	}
+	function byId(id, tag, root) {
+		var arr = [],
+			doc = root.ownerDocument || root,
+			el = doc.getElementById(stripslashes(id));
+		if (el) {
+			if (cmpTag(tag, el.nodeName) && _contains(root, el)) {
+				arr.push(el);
+			}
+		}
+		return arr;
+	}
+	function byClass(className, tag, root) {
+		var doc = root.ownerDocument || root, arr = [], els, i, len, el;
+		if (root.getElementsByClassName) {
+			els = root.getElementsByClassName(stripslashes(className));
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (cmpTag(tag, el.nodeName)) {
+					arr.push(el);
+				}
+			}
+		} else if (doc.querySelectorAll) {
+			els = doc.querySelectorAll((root.nodeName !== '#document' ? root.nodeName + ' ' : '') + tag + '.' + className);
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (_contains(root, el)) {
+					arr.push(el);
+				}
+			}
+		} else {
+			els = root.getElementsByTagName(tag);
+			className = ' ' + className + ' ';
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (el.nodeType == 1) {
+					var cls = el.className;
+					if (cls && (' ' + cls + ' ').indexOf(className) > -1) {
+						arr.push(el);
+					}
+				}
+			}
+		}
+		return arr;
+	}
+	function byName(name, tag, root) {
+		var arr = [], doc = root.ownerDocument || root,
+			els = doc.getElementsByName(stripslashes(name)), el;
+		for (var i = 0, len = els.length; i < len; i++) {
+			el = els[i];
+			if (cmpTag(tag, el.nodeName) && _contains(root, el)) {
+				if (el.getAttribute('name') !== null) {
+					arr.push(el);
+				}
+			}
+		}
+		return arr;
+	}
+	function byAttr(key, val, tag, root) {
+		var arr = [], els = root.getElementsByTagName(tag), el;
+		for (var i = 0, len = els.length; i < len; i++) {
+			el = els[i];
+			if (el.nodeType == 1) {
+				if (val === null) {
+					if (_getAttr(el, key) !== null) {
+						arr.push(el);
+					}
+				} else {
+					if (val === escape(_getAttr(el, key))) {
+						arr.push(el);
+					}
+				}
+			}
+		}
+		return arr;
+	}
+	function select(expr, root) {
+		var arr = [], matches;
+		matches = /^((?:\\.|[^.#\s\[<>])+)/.exec(expr);
+		var tag = matches ? matches[1] : '*';
+		if ((matches = /#((?:[\w\-]|\\.)+)$/.exec(expr))) {
+			arr = byId(matches[1], tag, root);
+		} else if ((matches = /\.((?:[\w\-]|\\.)+)$/.exec(expr))) {
+			arr = byClass(matches[1], tag, root);
+		} else if ((matches = /\[((?:[\w\-]|\\.)+)\]/.exec(expr))) {
+			arr = byAttr(matches[1].toLowerCase(), null, tag, root);
+		} else if ((matches = /\[((?:[\w\-]|\\.)+)\s*=\s*['"]?((?:\\.|[^'"]+)+)['"]?\]/.exec(expr))) {
+			var key = matches[1].toLowerCase(), val = matches[2];
+			if (key === 'id') {
+				arr = byId(val, tag, root);
+			} else if (key === 'class') {
+				arr = byClass(val, tag, root);
+			} else if (key === 'name') {
+				arr = byName(val, tag, root);
+			} else {
+				arr = byAttr(key, val, tag, root);
+			}
+		} else {
+			var els = root.getElementsByTagName(tag), el;
+			for (var i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (el.nodeType == 1) {
+					arr.push(el);
+				}
+			}
+		}
+		return arr;
+	}
+	var parts = [], arr, re = /((?:\\.|[^\s>])+|[\s>])/g;
+	while ((arr = re.exec(expr))) {
+		if (arr[1] !== ' ') {
+			parts.push(arr[1]);
+		}
+	}
+	var results = [];
+	if (parts.length == 1) {
+		return select(parts[0], root);
+	}
+	var isChild = false, part, els, subResults, val, v, i, j, k, length, len, l;
+	for (i = 0, lenth = parts.length; i < lenth; i++) {
+		part = parts[i];
+		if (part === '>') {
+			isChild = true;
+			continue;
+		}
+		if (i > 0) {
+			els = [];
+			for (j = 0, len = results.length; j < len; j++) {
+				val = results[j];
+				subResults = select(part, val);
+				for (k = 0, l = subResults.length; k < l; k++) {
+					v = subResults[k];
+					if (isChild) {
+						if (val === v.parentNode) {
+							els.push(v);
+						}
+					} else {
+						els.push(v);
+					}
+				}
+			}
+			results = els;
+		} else {
+			results = select(part, root);
+		}
+		if (results.length === 0) {
+			return [];
+		}
+	}
+	return results;
+}
+function _query(expr, root) {
+	var arr = _queryAll(expr, root);
+	return arr.length > 0 ? arr[0] : null;
+}
+K.query = _query;
+K.queryAll = _queryAll;
+function _get(val) {
+	return K(val)[0];
+}
+function _getDoc(node) {
+	if (!node) {
+		return document;
+	}
+	return node.ownerDocument || node.document || node;
+}
+function _getWin(node) {
+	if (!node) {
+		return window;
+	}
+	var doc = _getDoc(node);
+	return doc.parentWindow || doc.defaultView;
+}
+function _setHtml(el, html) {
+	if (el.nodeType != 1) {
+		return;
+	}
+	var doc = _getDoc(el);
+	try {
+		el.innerHTML = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + html;
+		var temp = doc.getElementById('__kindeditor_temp_tag__');
+		temp.parentNode.removeChild(temp);
+	} catch(e) {
+		K(el).empty();
+		K('@' + html, doc).each(function() {
+			el.appendChild(this);
+		});
+	}
+}
+function _hasClass(el, cls) {
+	return _inString(cls, el.className, ' ');
+}
+function _setAttr(el, key, val) {
+	if (_IE && _V < 8 && key.toLowerCase() == 'class') {
+		key = 'className';
+	}
+	el.setAttribute(key, '' + val);
+}
+function _removeAttr(el, key) {
+	if (_IE && _V < 8 && key.toLowerCase() == 'class') {
+		key = 'className';
+	}
+	_setAttr(el, key, '');
+	el.removeAttribute(key);
+}
+function _getNodeName(node) {
+	if (!node || !node.nodeName) {
+		return '';
+	}
+	return node.nodeName.toLowerCase();
+}
+function _computedCss(el, key) {
+	var self = this, win = _getWin(el), camelKey = _toCamel(key), val = '';
+	if (win.getComputedStyle) {
+		var style = win.getComputedStyle(el, null);
+		val = style[camelKey] || style.getPropertyValue(key) || el.style[camelKey];
+	} else if (el.currentStyle) {
+		val = el.currentStyle[camelKey] || el.style[camelKey];
+	}
+	return val;
+}
+function _hasVal(node) {
+	return !!_VALUE_TAG_MAP[_getNodeName(node)];
+}
+function _docElement(doc) {
+	doc = doc || document;
+	return _QUIRKS ? doc.body : doc.documentElement;
+}
+function _docHeight(doc) {
+	var el = _docElement(doc);
+	return Math.max(el.scrollHeight, el.clientHeight);
+}
+function _docWidth(doc) {
+	var el = _docElement(doc);
+	return Math.max(el.scrollWidth, el.clientWidth);
+}
+function _getScrollPos(doc) {
+	doc = doc || document;
+	var x, y;
+	if (_IE || _NEWIE || _OPERA) {
+		x = _docElement(doc).scrollLeft;
+		y = _docElement(doc).scrollTop;
+	} else {
+		x = _getWin(doc).scrollX;
+		y = _getWin(doc).scrollY;
+	}
+	return {x : x, y : y};
+}
+function KNode(node) {
+	this.init(node);
+}
+_extend(KNode, {
+	init : function(node) {
+		var self = this;
+		node = _isArray(node) ? node : [node];
+		var length = 0;
+		for (var i = 0, len = node.length; i < len; i++) {
+			if (node[i]) {
+				self[i] = node[i].constructor === KNode ? node[i][0] : node[i];
+				length++;
+			}
+		}
+		self.length = length;
+		self.doc = _getDoc(self[0]);
+		self.name = _getNodeName(self[0]);
+		self.type = self.length > 0 ? self[0].nodeType : null;
+		self.win = _getWin(self[0]);
+	},
+	each : function(fn) {
+		var self = this;
+		for (var i = 0; i < self.length; i++) {
+			if (fn.call(self[i], i, self[i]) === false) {
+				return self;
+			}
+		}
+		return self;
+	},
+	bind : function(type, fn) {
+		this.each(function() {
+			_bind(this, type, fn);
+		});
+		return this;
+	},
+	unbind : function(type, fn) {
+		this.each(function() {
+			_unbind(this, type, fn);
+		});
+		return this;
+	},
+	fire : function(type) {
+		if (this.length < 1) {
+			return this;
+		}
+		_fire(this[0], type);
+		return this;
+	},
+	hasAttr : function(key) {
+		if (this.length < 1) {
+			return false;
+		}
+		return !!_getAttr(this[0], key);
+	},
+	attr : function(key, val) {
+		var self = this;
+		if (key === undefined) {
+			return _getAttrList(self.outer());
+		}
+		if (typeof key === 'object') {
+			_each(key, function(k, v) {
+				self.attr(k, v);
+			});
+			return self;
+		}
+		if (val === undefined) {
+			val = self.length < 1 ? null : _getAttr(self[0], key);
+			return val === null ? '' : val;
+		}
+		self.each(function() {
+			_setAttr(this, key, val);
+		});
+		return self;
+	},
+	removeAttr : function(key) {
+		this.each(function() {
+			_removeAttr(this, key);
+		});
+		return this;
+	},
+	get : function(i) {
+		if (this.length < 1) {
+			return null;
+		}
+		return this[i || 0];
+	},
+	eq : function(i) {
+		if (this.length < 1) {
+			return null;
+		}
+		return this[i] ? new KNode(this[i]) : null;
+	},
+	hasClass : function(cls) {
+		if (this.length < 1) {
+			return false;
+		}
+		return _hasClass(this[0], cls);
+	},
+	addClass : function(cls) {
+		this.each(function() {
+			if (!_hasClass(this, cls)) {
+				this.className = _trim(this.className + ' ' + cls);
+			}
+		});
+		return this;
+	},
+	removeClass : function(cls) {
+		this.each(function() {
+			if (_hasClass(this, cls)) {
+				this.className = _trim(this.className.replace(new RegExp('(^|\\s)' + cls + '(\\s|$)'), ' '));
+			}
+		});
+		return this;
+	},
+	html : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1 || self.type != 1) {
+				return '';
+			}
+			return _formatHtml(self[0].innerHTML);
+		}
+		self.each(function() {
+			_setHtml(this, val);
+		});
+		return self;
+	},
+	text : function() {
+		var self = this;
+		if (self.length < 1) {
+			return '';
+		}
+		return _IE ? self[0].innerText : self[0].textContent;
+	},
+	hasVal : function() {
+		if (this.length < 1) {
+			return false;
+		}
+		return _hasVal(this[0]);
+	},
+	val : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return '';
+			}
+			return self.hasVal() ? self[0].value : self.attr('value');
+		} else {
+			self.each(function() {
+				if (_hasVal(this)) {
+					this.value = val;
+				} else {
+					_setAttr(this, 'value' , val);
+				}
+			});
+			return self;
+		}
+	},
+	css : function(key, val) {
+		var self = this;
+		if (key === undefined) {
+			return _getCssList(self.attr('style'));
+		}
+		if (typeof key === 'object') {
+			_each(key, function(k, v) {
+				self.css(k, v);
+			});
+			return self;
+		}
+		if (val === undefined) {
+			if (self.length < 1) {
+				return '';
+			}
+			return self[0].style[_toCamel(key)] || _computedCss(self[0], key) || '';
+		}
+		self.each(function() {
+			this.style[_toCamel(key)] = val;
+		});
+		return self;
+	},
+	width : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return 0;
+			}
+			return self[0].offsetWidth;
+		}
+		return self.css('width', _addUnit(val));
+	},
+	height : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return 0;
+			}
+			return self[0].offsetHeight;
+		}
+		return self.css('height', _addUnit(val));
+	},
+	opacity : function(val) {
+		this.each(function() {
+			if (this.style.opacity === undefined) {
+				this.style.filter = val == 1 ? '' : 'alpha(opacity=' + (val * 100) + ')';
+			} else {
+				this.style.opacity = val == 1 ? '' : val;
+			}
+		});
+		return this;
+	},
+	data : function(key, val) {
+		var self = this;
+		key = 'kindeditor_data_' + key;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return null;
+			}
+			return self[0][key];
+		}
+		this.each(function() {
+			this[key] = val;
+		});
+		return self;
+	},
+	pos : function() {
+		var self = this, node = self[0], x = 0, y = 0;
+		if (node) {
+			if (node.getBoundingClientRect) {
+				var box = node.getBoundingClientRect(),
+					pos = _getScrollPos(self.doc);
+				x = box.left + pos.x;
+				y = box.top + pos.y;
+			} else {
+				while (node) {
+					x += node.offsetLeft;
+					y += node.offsetTop;
+					node = node.offsetParent;
+				}
+			}
+		}
+		return {x : _round(x), y : _round(y)};
+	},
+	clone : function(bool) {
+		if (this.length < 1) {
+			return new KNode([]);
+		}
+		return new KNode(this[0].cloneNode(bool));
+	},
+	append : function(expr) {
+		this.each(function() {
+			if (this.appendChild) {
+				this.appendChild(_get(expr));
+			}
+		});
+		return this;
+	},
+	appendTo : function(expr) {
+		this.each(function() {
+			_get(expr).appendChild(this);
+		});
+		return this;
+	},
+	before : function(expr) {
+		this.each(function() {
+			this.parentNode.insertBefore(_get(expr), this);
+		});
+		return this;
+	},
+	after : function(expr) {
+		this.each(function() {
+			if (this.nextSibling) {
+				this.parentNode.insertBefore(_get(expr), this.nextSibling);
+			} else {
+				this.parentNode.appendChild(_get(expr));
+			}
+		});
+		return this;
+	},
+	replaceWith : function(expr) {
+		var nodes = [];
+		this.each(function(i, node) {
+			_unbind(node);
+			var newNode = _get(expr);
+			node.parentNode.replaceChild(newNode, node);
+			nodes.push(newNode);
+		});
+		return K(nodes);
+	},
+	empty : function() {
+		var self = this;
+		self.each(function(i, node) {
+			var child = node.firstChild;
+			while (child) {
+				if (!node.parentNode) {
+					return;
+				}
+				var next = child.nextSibling;
+				child.parentNode.removeChild(child);
+				child = next;
+			}
+		});
+		return self;
+	},
+	remove : function(keepChilds) {
+		var self = this;
+		self.each(function(i, node) {
+			if (!node.parentNode) {
+				return;
+			}
+			_unbind(node);
+			if (keepChilds) {
+				var child = node.firstChild;
+				while (child) {
+					var next = child.nextSibling;
+					node.parentNode.insertBefore(child, node);
+					child = next;
+				}
+			}
+			node.parentNode.removeChild(node);
+			delete self[i];
+		});
+		self.length = 0;
+		return self;
+	},
+	show : function(val) {
+		var self = this;
+		if (val === undefined) {
+			val = self._originDisplay || '';
+		}
+		if (self.css('display') != 'none') {
+			return self;
+		}
+		return self.css('display', val);
+	},
+	hide : function() {
+		var self = this;
+		if (self.length < 1) {
+			return self;
+		}
+		self._originDisplay = self[0].style.display;
+		return self.css('display', 'none');
+	},
+	outer : function() {
+		var self = this;
+		if (self.length < 1) {
+			return '';
+		}
+		var div = self.doc.createElement('div'), html;
+		div.appendChild(self[0].cloneNode(true));
+		html = _formatHtml(div.innerHTML);
+		div = null;
+		return html;
+	},
+	isSingle : function() {
+		return !!_SINGLE_TAG_MAP[this.name];
+	},
+	isInline : function() {
+		return !!_INLINE_TAG_MAP[this.name];
+	},
+	isBlock : function() {
+		return !!_BLOCK_TAG_MAP[this.name];
+	},
+	isStyle : function() {
+		return !!_STYLE_TAG_MAP[this.name];
+	},
+	isControl : function() {
+		return !!_CONTROL_TAG_MAP[this.name];
+	},
+	contains : function(otherNode) {
+		if (this.length < 1) {
+			return false;
+		}
+		return _contains(this[0], _get(otherNode));
+	},
+	parent : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].parentNode;
+		return node ? new KNode(node) : null;
+	},
+	children : function() {
+		if (this.length < 1) {
+			return new KNode([]);
+		}
+		var list = [], child = this[0].firstChild;
+		while (child) {
+			if (child.nodeType != 3 || _trim(child.nodeValue) !== '') {
+				list.push(child);
+			}
+			child = child.nextSibling;
+		}
+		return new KNode(list);
+	},
+	first : function() {
+		var list = this.children();
+		return list.length > 0 ? list.eq(0) : null;
+	},
+	last : function() {
+		var list = this.children();
+		return list.length > 0 ? list.eq(list.length - 1) : null;
+	},
+	index : function() {
+		if (this.length < 1) {
+			return -1;
+		}
+		var i = -1, sibling = this[0];
+		while (sibling) {
+			i++;
+			sibling = sibling.previousSibling;
+		}
+		return i;
+	},
+	prev : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].previousSibling;
+		return node ? new KNode(node) : null;
+	},
+	next : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].nextSibling;
+		return node ? new KNode(node) : null;
+	},
+	scan : function(fn, order) {
+		if (this.length < 1) {
+			return;
+		}
+		order = (order === undefined) ? true : order;
+		function walk(node) {
+			var n = order ? node.firstChild : node.lastChild;
+			while (n) {
+				var next = order ? n.nextSibling : n.previousSibling;
+				if (fn(n) === false) {
+					return false;
+				}
+				if (walk(n) === false) {
+					return false;
+				}
+				n = next;
+			}
+		}
+		walk(this[0]);
+		return this;
+	}
+});
+_each(('blur,focus,focusin,focusout,load,resize,scroll,unload,click,dblclick,' +
+	'mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,' +
+	'change,select,submit,keydown,keypress,keyup,error,contextmenu').split(','), function(i, type) {
+	KNode.prototype[type] = function(fn) {
+		return fn ? this.bind(type, fn) : this.fire(type);
+	};
+});
+var _K = K;
+K = function(expr, root) {
+	if (expr === undefined || expr === null) {
+		return;
+	}
+	function newNode(node) {
+		if (!node[0]) {
+			node = [];
+		}
+		return new KNode(node);
+	}
+	if (typeof expr === 'string') {
+		if (root) {
+			root = _get(root);
+		}
+		var length = expr.length;
+		if (expr.charAt(0) === '@') {
+			expr = expr.substr(1);
+		}
+		if (expr.length !== length || /<.+>/.test(expr)) {
+			var doc = root ? root.ownerDocument || root : document,
+				div = doc.createElement('div'), list = [];
+			div.innerHTML = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + expr;
+			for (var i = 0, len = div.childNodes.length; i < len; i++) {
+				var child = div.childNodes[i];
+				if (child.id == '__kindeditor_temp_tag__') {
+					continue;
+				}
+				list.push(child);
+			}
+			return newNode(list);
+		}
+		return newNode(_queryAll(expr, root));
+	}
+	if (expr && expr.constructor === KNode) {
+		return expr;
+	}
+	if (expr.toArray) {
+		expr = expr.toArray();
+	}
+	if (_isArray(expr)) {
+		return newNode(expr);
+	}
+	return newNode(_toArray(arguments));
+};
+_each(_K, function(key, val) {
+	K[key] = val;
+});
+K.NodeClass = KNode;
+window.KindEditor = K;
+var _START_TO_START = 0,
+	_START_TO_END = 1,
+	_END_TO_END = 2,
+	_END_TO_START = 3,
+	_BOOKMARK_ID = 0;
+function _updateCollapsed(range) {
+	range.collapsed = (range.startContainer === range.endContainer && range.startOffset === range.endOffset);
+	return range;
+}
+function _copyAndDelete(range, isCopy, isDelete) {
+	var doc = range.doc, nodeList = [];
+	function splitTextNode(node, startOffset, endOffset) {
+		var length = node.nodeValue.length, centerNode;
+		if (isCopy) {
+			var cloneNode = node.cloneNode(true);
+			if (startOffset > 0) {
+				centerNode = cloneNode.splitText(startOffset);
+			} else {
+				centerNode = cloneNode;
+			}
+			if (endOffset < length) {
+				centerNode.splitText(endOffset - startOffset);
+			}
+		}
+		if (isDelete) {
+			var center = node;
+			if (startOffset > 0) {
+				center = node.splitText(startOffset);
+				range.setStart(node, startOffset);
+			}
+			if (endOffset < length) {
+				var right = center.splitText(endOffset - startOffset);
+				range.setEnd(right, 0);
+			}
+			nodeList.push(center);
+		}
+		return centerNode;
+	}
+	function removeNodes() {
+		if (isDelete) {
+			range.up().collapse(true);
+		}
+		for (var i = 0, len = nodeList.length; i < len; i++) {
+			var node = nodeList[i];
+			if (node.parentNode) {
+				node.parentNode.removeChild(node);
+			}
+		}
+	}
+	var copyRange = range.cloneRange().down();
+	var start = -1, incStart = -1, incEnd = -1, end = -1,
+		ancestor = range.commonAncestor(), frag = doc.createDocumentFragment();
+	if (ancestor.nodeType == 3) {
+		var textNode = splitTextNode(ancestor, range.startOffset, range.endOffset);
+		if (isCopy) {
+			frag.appendChild(textNode);
+		}
+		removeNodes();
+		return isCopy ? frag : range;
+	}
+	function extractNodes(parent, frag) {
+		var node = parent.firstChild, nextNode;
+		while (node) {
+			var testRange = new KRange(doc).selectNode(node);
+			start = testRange.compareBoundaryPoints(_START_TO_END, range);
+			if (start >= 0 && incStart <= 0) {
+				incStart = testRange.compareBoundaryPoints(_START_TO_START, range);
+			}
+			if (incStart >= 0 && incEnd <= 0) {
+				incEnd = testRange.compareBoundaryPoints(_END_TO_END, range);
+			}
+			if (incEnd >= 0 && end <= 0) {
+				end = testRange.compareBoundaryPoints(_END_TO_START, range);
+			}
+			if (end >= 0) {
+				return false;
+			}
+			nextNode = node.nextSibling;
+			if (start > 0) {
+				if (node.nodeType == 1) {
+					if (incStart >= 0 && incEnd <= 0) {
+						if (isCopy) {
+							frag.appendChild(node.cloneNode(true));
+						}
+						if (isDelete) {
+							nodeList.push(node);
+						}
+					} else {
+						var childFlag;
+						if (isCopy) {
+							childFlag = node.cloneNode(false);
+							frag.appendChild(childFlag);
+						}
+						if (extractNodes(node, childFlag) === false) {
+							return false;
+						}
+					}
+				} else if (node.nodeType == 3) {
+					var textNode;
+					if (node == copyRange.startContainer) {
+						textNode = splitTextNode(node, copyRange.startOffset, node.nodeValue.length);
+					} else if (node == copyRange.endContainer) {
+						textNode = splitTextNode(node, 0, copyRange.endOffset);
+					} else {
+						textNode = splitTextNode(node, 0, node.nodeValue.length);
+					}
+					if (isCopy) {
+						try {
+							frag.appendChild(textNode);
+						} catch(e) {}
+					}
+				}
+			}
+			node = nextNode;
+		}
+	}
+	extractNodes(ancestor, frag);
+	if (isDelete) {
+		range.up().collapse(true);
+	}
+	for (var i = 0, len = nodeList.length; i < len; i++) {
+		var node = nodeList[i];
+		if (node.parentNode) {
+			node.parentNode.removeChild(node);
+		}
+	}
+	return isCopy ? frag : range;
+}
+function _moveToElementText(range, el) {
+	var node = el;
+	while (node) {
+		var knode = K(node);
+		if (knode.name == 'marquee' || knode.name == 'select') {
+			return;
+		}
+		node = node.parentNode;
+	}
+	try {
+		range.moveToElementText(el);
+	} catch(e) {}
+}
+function _getStartEnd(rng, isStart) {
+	var doc = rng.parentElement().ownerDocument,
+		pointRange = rng.duplicate();
+	pointRange.collapse(isStart);
+	var parent = pointRange.parentElement(),
+		nodes = parent.childNodes;
+	if (nodes.length === 0) {
+		return {node: parent.parentNode, offset: K(parent).index()};
+	}
+	var startNode = doc, startPos = 0, cmp = -1;
+	var testRange = rng.duplicate();
+	_moveToElementText(testRange, parent);
+	for (var i = 0, len = nodes.length; i < len; i++) {
+		var node = nodes[i];
+		cmp = testRange.compareEndPoints('StartToStart', pointRange);
+		if (cmp === 0) {
+			return {node: node.parentNode, offset: i};
+		}
+		if (node.nodeType == 1) {
+			var nodeRange = rng.duplicate(), dummy, knode = K(node), newNode = node;
+			if (knode.isControl()) {
+				dummy = doc.createElement('span');
+				knode.after(dummy);
+				newNode = dummy;
+				startPos += knode.text().replace(/\r\n|\n|\r/g, '').length;
+			}
+			_moveToElementText(nodeRange, newNode);
+			testRange.setEndPoint('StartToEnd', nodeRange);
+			if (cmp > 0) {
+				startPos += nodeRange.text.replace(/\r\n|\n|\r/g, '').length;
+			} else {
+				startPos = 0;
+			}
+			if (dummy) {
+				K(dummy).remove();
+			}
+		} else if (node.nodeType == 3) {
+			testRange.moveStart('character', node.nodeValue.length);
+			startPos += node.nodeValue.length;
+		}
+		if (cmp < 0) {
+			startNode = node;
+		}
+	}
+	if (cmp < 0 && startNode.nodeType == 1) {
+		return {node: parent, offset: K(parent.lastChild).index() + 1};
+	}
+	if (cmp > 0) {
+		while (startNode.nextSibling && startNode.nodeType == 1) {
+			startNode = startNode.nextSibling;
+		}
+	}
+	testRange = rng.duplicate();
+	_moveToElementText(testRange, parent);
+	testRange.setEndPoint('StartToEnd', pointRange);
+	startPos -= testRange.text.replace(/\r\n|\n|\r/g, '').length;
+	if (cmp > 0 && startNode.nodeType == 3) {
+		var prevNode = startNode.previousSibling;
+		while (prevNode && prevNode.nodeType == 3) {
+			startPos -= prevNode.nodeValue.length;
+			prevNode = prevNode.previousSibling;
+		}
+	}
+	return {node: startNode, offset: startPos};
+}
+function _getEndRange(node, offset) {
+	var doc = node.ownerDocument || node,
+		range = doc.body.createTextRange();
+	if (doc == node) {
+		range.collapse(true);
+		return range;
+	}
+	if (node.nodeType == 1 && node.childNodes.length > 0) {
+		var children = node.childNodes, isStart, child;
+		if (offset === 0) {
+			child = children[0];
+			isStart = true;
+		} else {
+			child = children[offset - 1];
+			isStart = false;
+		}
+		if (!child) {
+			return range;
+		}
+		if (K(child).name === 'head') {
+			if (offset === 1) {
+				isStart = true;
+			}
+			if (offset === 2) {
+				isStart = false;
+			}
+			range.collapse(isStart);
+			return range;
+		}
+		if (child.nodeType == 1) {
+			var kchild = K(child), span;
+			if (kchild.isControl()) {
+				span = doc.createElement('span');
+				if (isStart) {
+					kchild.before(span);
+				} else {
+					kchild.after(span);
+				}
+				child = span;
+			}
+			_moveToElementText(range, child);
+			range.collapse(isStart);
+			if (span) {
+				K(span).remove();
+			}
+			return range;
+		}
+		node = child;
+		offset = isStart ? 0 : child.nodeValue.length;
+	}
+	var dummy = doc.createElement('span');
+	K(node).before(dummy);
+	_moveToElementText(range, dummy);
+	range.moveStart('character', offset);
+	K(dummy).remove();
+	return range;
+}
+function _toRange(rng) {
+	var doc, range;
+	function tr2td(start) {
+		if (K(start.node).name == 'tr') {
+			start.node = start.node.cells[start.offset];
+			start.offset = 0;
+		}
+	}
+	if (_IERANGE) {
+		if (rng.item) {
+			doc = _getDoc(rng.item(0));
+			range = new KRange(doc);
+			range.selectNode(rng.item(0));
+			return range;
+		}
+		doc = rng.parentElement().ownerDocument;
+		var start = _getStartEnd(rng, true),
+			end = _getStartEnd(rng, false);
+		tr2td(start);
+		tr2td(end);
+		range = new KRange(doc);
+		range.setStart(start.node, start.offset);
+		range.setEnd(end.node, end.offset);
+		return range;
+	}
+	var startContainer = rng.startContainer;
+	doc = startContainer.ownerDocument || startContainer;
+	range = new KRange(doc);
+	range.setStart(startContainer, rng.startOffset);
+	range.setEnd(rng.endContainer, rng.endOffset);
+	return range;
+}
+function KRange(doc) {
+	this.init(doc);
+}
+_extend(KRange, {
+	init : function(doc) {
+		var self = this;
+		self.startContainer = doc;
+		self.startOffset = 0;
+		self.endContainer = doc;
+		self.endOffset = 0;
+		self.collapsed = true;
+		self.doc = doc;
+	},
+	commonAncestor : function() {
+		function getParents(node) {
+			var parents = [];
+			while (node) {
+				parents.push(node);
+				node = node.parentNode;
+			}
+			return parents;
+		}
+		var parentsA = getParents(this.startContainer),
+			parentsB = getParents(this.endContainer),
+			i = 0, lenA = parentsA.length, lenB = parentsB.length, parentA, parentB;
+		while (++i) {
+			parentA = parentsA[lenA - i];
+			parentB = parentsB[lenB - i];
+			if (!parentA || !parentB || parentA !== parentB) {
+				break;
+			}
+		}
+		return parentsA[lenA - i + 1];
+	},
+	setStart : function(node, offset) {
+		var self = this, doc = self.doc;
+		self.startContainer = node;
+		self.startOffset = offset;
+		if (self.endContainer === doc) {
+			self.endContainer = node;
+			self.endOffset = offset;
+		}
+		return _updateCollapsed(this);
+	},
+	setEnd : function(node, offset) {
+		var self = this, doc = self.doc;
+		self.endContainer = node;
+		self.endOffset = offset;
+		if (self.startContainer === doc) {
+			self.startContainer = node;
+			self.startOffset = offset;
+		}
+		return _updateCollapsed(this);
+	},
+	setStartBefore : function(node) {
+		return this.setStart(node.parentNode || this.doc, K(node).index());
+	},
+	setStartAfter : function(node) {
+		return this.setStart(node.parentNode || this.doc, K(node).index() + 1);
+	},
+	setEndBefore : function(node) {
+		return this.setEnd(node.parentNode || this.doc, K(node).index());
+	},
+	setEndAfter : function(node) {
+		return this.setEnd(node.parentNode || this.doc, K(node).index() + 1);
+	},
+	selectNode : function(node) {
+		return this.setStartBefore(node).setEndAfter(node);
+	},
+	selectNodeContents : function(node) {
+		var knode = K(node);
+		if (knode.type == 3 || knode.isSingle()) {
+			return this.selectNode(node);
+		}
+		var children = knode.children();
+		if (children.length > 0) {
+			return this.setStartBefore(children[0]).setEndAfter(children[children.length - 1]);
+		}
+		return this.setStart(node, 0).setEnd(node, 0);
+	},
+	collapse : function(toStart) {
+		if (toStart) {
+			return this.setEnd(this.startContainer, this.startOffset);
+		}
+		return this.setStart(this.endContainer, this.endOffset);
+	},
+	compareBoundaryPoints : function(how, range) {
+		var rangeA = this.get(), rangeB = range.get();
+		if (_IERANGE) {
+			var arr = {};
+			arr[_START_TO_START] = 'StartToStart';
+			arr[_START_TO_END] = 'EndToStart';
+			arr[_END_TO_END] = 'EndToEnd';
+			arr[_END_TO_START] = 'StartToEnd';
+			var cmp = rangeA.compareEndPoints(arr[how], rangeB);
+			if (cmp !== 0) {
+				return cmp;
+			}
+			var nodeA, nodeB, nodeC, posA, posB;
+			if (how === _START_TO_START || how === _END_TO_START) {
+				nodeA = this.startContainer;
+				posA = this.startOffset;
+			}
+			if (how === _START_TO_END || how === _END_TO_END) {
+				nodeA = this.endContainer;
+				posA = this.endOffset;
+			}
+			if (how === _START_TO_START || how === _START_TO_END) {
+				nodeB = range.startContainer;
+				posB = range.startOffset;
+			}
+			if (how === _END_TO_END || how === _END_TO_START) {
+				nodeB = range.endContainer;
+				posB = range.endOffset;
+			}
+			if (nodeA === nodeB) {
+				var diff = posA - posB;
+				return diff > 0 ? 1 : (diff < 0 ? -1 : 0);
+			}
+			nodeC = nodeB;
+			while (nodeC && nodeC.parentNode !== nodeA) {
+				nodeC = nodeC.parentNode;
+			}
+			if (nodeC) {
+				return K(nodeC).index() >= posA ? -1 : 1;
+			}
+			nodeC = nodeA;
+			while (nodeC && nodeC.parentNode !== nodeB) {
+				nodeC = nodeC.parentNode;
+			}
+			if (nodeC) {
+				return K(nodeC).index() >= posB ? 1 : -1;
+			}
+			nodeC = K(nodeB).next();
+			if (nodeC && nodeC.contains(nodeA)) {
+				return 1;
+			}
+			nodeC = K(nodeA).next();
+			if (nodeC && nodeC.contains(nodeB)) {
+				return -1;
+			}
+		} else {
+			return rangeA.compareBoundaryPoints(how, rangeB);
+		}
+	},
+	cloneRange : function() {
+		return new KRange(this.doc).setStart(this.startContainer, this.startOffset).setEnd(this.endContainer, this.endOffset);
+	},
+	toString : function() {
+		var rng = this.get(), str = _IERANGE ? rng.text : rng.toString();
+		return str.replace(/\r\n|\n|\r/g, '');
+	},
+	cloneContents : function() {
+		return _copyAndDelete(this, true, false);
+	},
+	deleteContents : function() {
+		return _copyAndDelete(this, false, true);
+	},
+	extractContents : function() {
+		return _copyAndDelete(this, true, true);
+	},
+	insertNode : function(node) {
+		var self = this,
+			sc = self.startContainer, so = self.startOffset,
+			ec = self.endContainer, eo = self.endOffset,
+			firstChild, lastChild, c, nodeCount = 1;
+		if (node.nodeName.toLowerCase() === '#document-fragment') {
+			firstChild = node.firstChild;
+			lastChild = node.lastChild;
+			nodeCount = node.childNodes.length;
+		}
+		if (sc.nodeType == 1) {
+			c = sc.childNodes[so];
+			if (c) {
+				sc.insertBefore(node, c);
+				if (sc === ec) {
+					eo += nodeCount;
+				}
+			} else {
+				sc.appendChild(node);
+			}
+		} else if (sc.nodeType == 3) {
+			if (so === 0) {
+				sc.parentNode.insertBefore(node, sc);
+				if (sc.parentNode === ec) {
+					eo += nodeCount;
+				}
+			} else if (so >= sc.nodeValue.length) {
+				if (sc.nextSibling) {
+					sc.parentNode.insertBefore(node, sc.nextSibling);
+				} else {
+					sc.parentNode.appendChild(node);
+				}
+			} else {
+				if (so > 0) {
+					c = sc.splitText(so);
+				} else {
+					c = sc;
+				}
+				sc.parentNode.insertBefore(node, c);
+				if (sc === ec) {
+					ec = c;
+					eo -= so;
+				}
+			}
+		}
+		if (firstChild) {
+			self.setStartBefore(firstChild).setEndAfter(lastChild);
+		} else {
+			self.selectNode(node);
+		}
+		if (self.compareBoundaryPoints(_END_TO_END, self.cloneRange().setEnd(ec, eo)) >= 1) {
+			return self;
+		}
+		return self.setEnd(ec, eo);
+	},
+	surroundContents : function(node) {
+		node.appendChild(this.extractContents());
+		return this.insertNode(node).selectNode(node);
+	},
+	isControl : function() {
+		var self = this,
+			sc = self.startContainer, so = self.startOffset,
+			ec = self.endContainer, eo = self.endOffset, rng;
+		return sc.nodeType == 1 && sc === ec && so + 1 === eo && K(sc.childNodes[so]).isControl();
+	},
+	get : function(hasControlRange) {
+		var self = this, doc = self.doc, node, rng;
+		if (!_IERANGE) {
+			rng = doc.createRange();
+			try {
+				rng.setStart(self.startContainer, self.startOffset);
+				rng.setEnd(self.endContainer, self.endOffset);
+			} catch (e) {}
+			return rng;
+		}
+		if (hasControlRange && self.isControl()) {
+			rng = doc.body.createControlRange();
+			rng.addElement(self.startContainer.childNodes[self.startOffset]);
+			return rng;
+		}
+		var range = self.cloneRange().down();
+		rng = doc.body.createTextRange();
+		rng.setEndPoint('StartToStart', _getEndRange(range.startContainer, range.startOffset));
+		rng.setEndPoint('EndToStart', _getEndRange(range.endContainer, range.endOffset));
+		return rng;
+	},
+	html : function() {
+		return K(this.cloneContents()).outer();
+	},
+	down : function() {
+		var self = this;
+		function downPos(node, pos, isStart) {
+			if (node.nodeType != 1) {
+				return;
+			}
+			var children = K(node).children();
+			if (children.length === 0) {
+				return;
+			}
+			var left, right, child, offset;
+			if (pos > 0) {
+				left = children.eq(pos - 1);
+			}
+			if (pos < children.length) {
+				right = children.eq(pos);
+			}
+			if (left && left.type == 3) {
+				child = left[0];
+				offset = child.nodeValue.length;
+			}
+			if (right && right.type == 3) {
+				child = right[0];
+				offset = 0;
+			}
+			if (!child) {
+				return;
+			}
+			if (isStart) {
+				self.setStart(child, offset);
+			} else {
+				self.setEnd(child, offset);
+			}
+		}
+		downPos(self.startContainer, self.startOffset, true);
+		downPos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	up : function() {
+		var self = this;
+		function upPos(node, pos, isStart) {
+			if (node.nodeType != 3) {
+				return;
+			}
+			if (pos === 0) {
+				if (isStart) {
+					self.setStartBefore(node);
+				} else {
+					self.setEndBefore(node);
+				}
+			} else if (pos == node.nodeValue.length) {
+				if (isStart) {
+					self.setStartAfter(node);
+				} else {
+					self.setEndAfter(node);
+				}
+			}
+		}
+		upPos(self.startContainer, self.startOffset, true);
+		upPos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	enlarge : function(toBlock) {
+		var self = this;
+		self.up();
+		function enlargePos(node, pos, isStart) {
+			var knode = K(node), parent;
+			if (knode.type == 3 || _NOSPLIT_TAG_MAP[knode.name] || !toBlock && knode.isBlock()) {
+				return;
+			}
+			if (pos === 0) {
+				while (!knode.prev()) {
+					parent = knode.parent();
+					if (!parent || _NOSPLIT_TAG_MAP[parent.name] || !toBlock && parent.isBlock()) {
+						break;
+					}
+					knode = parent;
+				}
+				if (isStart) {
+					self.setStartBefore(knode[0]);
+				} else {
+					self.setEndBefore(knode[0]);
+				}
+			} else if (pos == knode.children().length) {
+				while (!knode.next()) {
+					parent = knode.parent();
+					if (!parent || _NOSPLIT_TAG_MAP[parent.name] || !toBlock && parent.isBlock()) {
+						break;
+					}
+					knode = parent;
+				}
+				if (isStart) {
+					self.setStartAfter(knode[0]);
+				} else {
+					self.setEndAfter(knode[0]);
+				}
+			}
+		}
+		enlargePos(self.startContainer, self.startOffset, true);
+		enlargePos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	shrink : function() {
+		var self = this, child, collapsed = self.collapsed;
+		while (self.startContainer.nodeType == 1 && (child = self.startContainer.childNodes[self.startOffset]) && child.nodeType == 1 && !K(child).isSingle()) {
+			self.setStart(child, 0);
+		}
+		if (collapsed) {
+			return self.collapse(collapsed);
+		}
+		while (self.endContainer.nodeType == 1 && self.endOffset > 0 && (child = self.endContainer.childNodes[self.endOffset - 1]) && child.nodeType == 1 && !K(child).isSingle()) {
+			self.setEnd(child, child.childNodes.length);
+		}
+		return self;
+	},
+	createBookmark : function(serialize) {
+		var self = this, doc = self.doc, endNode,
+			startNode = K('<span style="display:none;"></span>', doc)[0];
+		startNode.id = '__kindeditor_bookmark_start_' + (_BOOKMARK_ID++) + '__';
+		if (!self.collapsed) {
+			endNode = startNode.cloneNode(true);
+			endNode.id = '__kindeditor_bookmark_end_' + (_BOOKMARK_ID++) + '__';
+		}
+		if (endNode) {
+			self.cloneRange().collapse(false).insertNode(endNode).setEndBefore(endNode);
+		}
+		self.insertNode(startNode).setStartAfter(startNode);
+		return {
+			start : serialize ? '#' + startNode.id : startNode,
+			end : endNode ? (serialize ? '#' + endNode.id : endNode) : null
+		};
+	},
+	moveToBookmark : function(bookmark) {
+		var self = this, doc = self.doc,
+			start = K(bookmark.start, doc), end = bookmark.end ? K(bookmark.end, doc) : null;
+		if (!start || start.length < 1) {
+			return self;
+		}
+		self.setStartBefore(start[0]);
+		start.remove();
+		if (end && end.length > 0) {
+			self.setEndBefore(end[0]);
+			end.remove();
+		} else {
+			self.collapse(true);
+		}
+		return self;
+	},
+	dump : function() {
+		console.log('--------------------');
+		console.log(this.startContainer.nodeType == 3 ? this.startContainer.nodeValue : this.startContainer, this.startOffset);
+		console.log(this.endContainer.nodeType == 3 ? this.endContainer.nodeValue : this.endContainer, this.endOffset);
+	}
+});
+function _range(mixed) {
+	if (!mixed.nodeName) {
+		return mixed.constructor === KRange ? mixed : _toRange(mixed);
+	}
+	return new KRange(mixed);
+}
+K.RangeClass = KRange;
+K.range = _range;
+K.START_TO_START = _START_TO_START;
+K.START_TO_END = _START_TO_END;
+K.END_TO_END = _END_TO_END;
+K.END_TO_START = _END_TO_START;
+function _nativeCommand(doc, key, val) {
+	try {
+		doc.execCommand(key, false, val);
+	} catch(e) {}
+}
+function _nativeCommandValue(doc, key) {
+	var val = '';
+	try {
+		val = doc.queryCommandValue(key);
+	} catch (e) {}
+	if (typeof val !== 'string') {
+		val = '';
+	}
+	return val;
+}
+function _getSel(doc) {
+	var win = _getWin(doc);
+	return _IERANGE ? doc.selection : win.getSelection();
+}
+function _getRng(doc) {
+	var sel = _getSel(doc), rng;
+	try {
+		if (sel.rangeCount > 0) {
+			rng = sel.getRangeAt(0);
+		} else {
+			rng = sel.createRange();
+		}
+	} catch(e) {}
+	if (_IERANGE && (!rng || (!rng.item && rng.parentElement().ownerDocument !== doc))) {
+		return null;
+	}
+	return rng;
+}
+function _singleKeyMap(map) {
+	var newMap = {}, arr, v;
+	_each(map, function(key, val) {
+		arr = key.split(',');
+		for (var i = 0, len = arr.length; i < len; i++) {
+			v = arr[i];
+			newMap[v] = val;
+		}
+	});
+	return newMap;
+}
+function _hasAttrOrCss(knode, map) {
+	return _hasAttrOrCssByKey(knode, map, '*') || _hasAttrOrCssByKey(knode, map);
+}
+function _hasAttrOrCssByKey(knode, map, mapKey) {
+	mapKey = mapKey || knode.name;
+	if (knode.type !== 1) {
+		return false;
+	}
+	var newMap = _singleKeyMap(map);
+	if (!newMap[mapKey]) {
+		return false;
+	}
+	var arr = newMap[mapKey].split(',');
+	for (var i = 0, len = arr.length; i < len; i++) {
+		var key = arr[i];
+		if (key === '*') {
+			return true;
+		}
+		var match = /^(\.?)([^=]+)(?:=([^=]*))?$/.exec(key);
+		var method = match[1] ? 'css' : 'attr';
+		key = match[2];
+		var val = match[3] || '';
+		if (val === '' && knode[method](key) !== '') {
+			return true;
+		}
+		if (val !== '' && knode[method](key) === val) {
+			return true;
+		}
+	}
+	return false;
+}
+function _removeAttrOrCss(knode, map) {
+	if (knode.type != 1) {
+		return;
+	}
+	_removeAttrOrCssByKey(knode, map, '*');
+	_removeAttrOrCssByKey(knode, map);
+}
+function _removeAttrOrCssByKey(knode, map, mapKey) {
+	mapKey = mapKey || knode.name;
+	if (knode.type !== 1) {
+		return;
+	}
+	var newMap = _singleKeyMap(map);
+	if (!newMap[mapKey]) {
+		return;
+	}
+	var arr = newMap[mapKey].split(','), allFlag = false;
+	for (var i = 0, len = arr.length; i < len; i++) {
+		var key = arr[i];
+		if (key === '*') {
+			allFlag = true;
+			break;
+		}
+		var match = /^(\.?)([^=]+)(?:=([^=]*))?$/.exec(key);
+		key = match[2];
+		if (match[1]) {
+			key = _toCamel(key);
+			if (knode[0].style[key]) {
+				knode[0].style[key] = '';
+			}
+		} else {
+			knode.removeAttr(key);
+		}
+	}
+	if (allFlag) {
+		knode.remove(true);
+	}
+}
+function _getInnerNode(knode) {
+	var inner = knode;
+	while (inner.first()) {
+		inner = inner.first();
+	}
+	return inner;
+}
+function _isEmptyNode(knode) {
+	if (knode.type != 1 || knode.isSingle()) {
+		return false;
+	}
+	return knode.html().replace(/<[^>]+>/g, '') === '';
+}
+function _mergeWrapper(a, b) {
+	a = a.clone(true);
+	var lastA = _getInnerNode(a), childA = a, merged = false;
+	while (b) {
+		while (childA) {
+			if (childA.name === b.name) {
+				_mergeAttrs(childA, b.attr(), b.css());
+				merged = true;
+			}
+			childA = childA.first();
+		}
+		if (!merged) {
+			lastA.append(b.clone(false));
+		}
+		merged = false;
+		b = b.first();
+	}
+	return a;
+}
+function _wrapNode(knode, wrapper) {
+	wrapper = wrapper.clone(true);
+	if (knode.type == 3) {
+		_getInnerNode(wrapper).append(knode.clone(false));
+		knode.replaceWith(wrapper);
+		return wrapper;
+	}
+	var nodeWrapper = knode, child;
+	while ((child = knode.first()) && child.children().length == 1) {
+		knode = child;
+	}
+	child = knode.first();
+	var frag = knode.doc.createDocumentFragment();
+	while (child) {
+		frag.appendChild(child[0]);
+		child = child.next();
+	}
+	wrapper = _mergeWrapper(nodeWrapper, wrapper);
+	if (frag.firstChild) {
+		_getInnerNode(wrapper).append(frag);
+	}
+	nodeWrapper.replaceWith(wrapper);
+	return wrapper;
+}
+function _mergeAttrs(knode, attrs, styles) {
+	_each(attrs, function(key, val) {
+		if (key !== 'style') {
+			knode.attr(key, val);
+		}
+	});
+	_each(styles, function(key, val) {
+		knode.css(key, val);
+	});
+}
+function _inPreElement(knode) {
+	while (knode && knode.name != 'body') {
+		if (_PRE_TAG_MAP[knode.name] || knode.name == 'div' && knode.hasClass('ke-script')) {
+			return true;
+		}
+		knode = knode.parent();
+	}
+	return false;
+}
+function KCmd(range) {
+	this.init(range);
+}
+_extend(KCmd, {
+	init : function(range) {
+		var self = this, doc = range.doc;
+		self.doc = doc;
+		self.win = _getWin(doc);
+		self.sel = _getSel(doc);
+		self.range = range;
+	},
+	selection : function(forceReset) {
+		var self = this, doc = self.doc, rng = _getRng(doc);
+		self.sel = _getSel(doc);
+		if (rng) {
+			self.range = _range(rng);
+			if (K(self.range.startContainer).name == 'html') {
+				self.range.selectNodeContents(doc.body).collapse(false);
+			}
+			return self;
+		}
+		if (forceReset) {
+			self.range.selectNodeContents(doc.body).collapse(false);
+		}
+		return self;
+	},
+	select : function(hasDummy) {
+		hasDummy = _undef(hasDummy, true);
+		var self = this, sel = self.sel, range = self.range.cloneRange().shrink(),
+			sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset,
+			doc = _getDoc(sc), win = self.win, rng, hasU200b = false;
+		if (hasDummy && sc.nodeType == 1 && range.collapsed) {
+			if (_IERANGE) {
+				var dummy = K('<span>&nbsp;</span>', doc);
+				range.insertNode(dummy[0]);
+				rng = doc.body.createTextRange();
+				try {
+					rng.moveToElementText(dummy[0]);
+				} catch(ex) {}
+				rng.collapse(false);
+				rng.select();
+				dummy.remove();
+				win.focus();
+				return self;
+			}
+			if (_WEBKIT) {
+				var children = sc.childNodes;
+				if (K(sc).isInline() || so > 0 && K(children[so - 1]).isInline() || children[so] && K(children[so]).isInline()) {
+					range.insertNode(doc.createTextNode('\u200B'));
+					hasU200b = true;
+				}
+			}
+		}
+		if (_IERANGE) {
+			try {
+				rng = range.get(true);
+				rng.select();
+			} catch(e) {}
+		} else {
+			if (hasU200b) {
+				range.collapse(false);
+			}
+			rng = range.get(true);
+			sel.removeAllRanges();
+			sel.addRange(rng);
+			if (doc !== document) {
+				var pos = K(rng.endContainer).pos();
+				win.scrollTo(pos.x, pos.y);
+			}
+		}
+		win.focus();
+		return self;
+	},
+	wrap : function(val) {
+		var self = this, doc = self.doc, range = self.range, wrapper;
+		wrapper = K(val, doc);
+		if (range.collapsed) {
+			range.shrink();
+			range.insertNode(wrapper[0]).selectNodeContents(wrapper[0]);
+			return self;
+		}
+		if (wrapper.isBlock()) {
+			var copyWrapper = wrapper.clone(true), child = copyWrapper;
+			while (child.first()) {
+				child = child.first();
+			}
+			child.append(range.extractContents());
+			range.insertNode(copyWrapper[0]).selectNode(copyWrapper[0]);
+			return self;
+		}
+		range.enlarge();
+		var bookmark = range.createBookmark(), ancestor = range.commonAncestor(), isStart = false;
+		K(ancestor).scan(function(node) {
+			if (!isStart && node == bookmark.start) {
+				isStart = true;
+				return;
+			}
+			if (isStart) {
+				if (node == bookmark.end) {
+					return false;
+				}
+				var knode = K(node);
+				if (_inPreElement(knode)) {
+					return;
+				}
+				if (knode.type == 3 && _trim(node.nodeValue).length > 0) {
+					var parent;
+					while ((parent = knode.parent()) && parent.isStyle() && parent.children().length == 1) {
+						knode = parent;
+					}
+					_wrapNode(knode, wrapper);
+				}
+			}
+		});
+		range.moveToBookmark(bookmark);
+		return self;
+	},
+	split : function(isStart, map) {
+		var range = this.range, doc = range.doc;
+		var tempRange = range.cloneRange().collapse(isStart);
+		var node = tempRange.startContainer, pos = tempRange.startOffset,
+			parent = node.nodeType == 3 ? node.parentNode : node,
+			needSplit = false, knode;
+		while (parent && parent.parentNode) {
+			knode = K(parent);
+			if (map) {
+				if (!knode.isStyle()) {
+					break;
+				}
+				if (!_hasAttrOrCss(knode, map)) {
+					break;
+				}
+			} else {
+				if (_NOSPLIT_TAG_MAP[knode.name]) {
+					break;
+				}
+			}
+			needSplit = true;
+			parent = parent.parentNode;
+		}
+		if (needSplit) {
+			var dummy = doc.createElement('span');
+			range.cloneRange().collapse(!isStart).insertNode(dummy);
+			if (isStart) {
+				tempRange.setStartBefore(parent.firstChild).setEnd(node, pos);
+			} else {
+				tempRange.setStart(node, pos).setEndAfter(parent.lastChild);
+			}
+			var frag = tempRange.extractContents(),
+				first = frag.firstChild, last = frag.lastChild;
+			if (isStart) {
+				tempRange.insertNode(frag);
+				range.setStartAfter(last).setEndBefore(dummy);
+			} else {
+				parent.appendChild(frag);
+				range.setStartBefore(dummy).setEndBefore(first);
+			}
+			var dummyParent = dummy.parentNode;
+			if (dummyParent == range.endContainer) {
+				var prev = K(dummy).prev(), next = K(dummy).next();
+				if (prev && next && prev.type == 3 && next.type == 3) {
+					range.setEnd(prev[0], prev[0].nodeValue.length);
+				} else if (!isStart) {
+					range.setEnd(range.endContainer, range.endOffset - 1);
+				}
+			}
+			dummyParent.removeChild(dummy);
+		}
+		return this;
+	},
+	remove : function(map) {
+		var self = this, doc = self.doc, range = self.range;
+		range.enlarge();
+		if (range.startOffset === 0) {
+			var ksc = K(range.startContainer), parent;
+			while ((parent = ksc.parent()) && parent.isStyle() && parent.children().length == 1) {
+				ksc = parent;
+			}
+			range.setStart(ksc[0], 0);
+			ksc = K(range.startContainer);
+			if (ksc.isBlock()) {
+				_removeAttrOrCss(ksc, map);
+			}
+			var kscp = ksc.parent();
+			if (kscp && kscp.isBlock()) {
+				_removeAttrOrCss(kscp, map);
+			}
+		}
+		var sc, so;
+		if (range.collapsed) {
+			self.split(true, map);
+			sc = range.startContainer;
+			so = range.startOffset;
+			if (so > 0) {
+				var sb = K(sc.childNodes[so - 1]);
+				if (sb && _isEmptyNode(sb)) {
+					sb.remove();
+					range.setStart(sc, so - 1);
+				}
+			}
+			var sa = K(sc.childNodes[so]);
+			if (sa && _isEmptyNode(sa)) {
+				sa.remove();
+			}
+			if (_isEmptyNode(sc)) {
+				range.startBefore(sc);
+				sc.remove();
+			}
+			range.collapse(true);
+			return self;
+		}
+		self.split(true, map);
+		self.split(false, map);
+		var startDummy = doc.createElement('span'), endDummy = doc.createElement('span');
+		range.cloneRange().collapse(false).insertNode(endDummy);
+		range.cloneRange().collapse(true).insertNode(startDummy);
+		var nodeList = [], cmpStart = false;
+		K(range.commonAncestor()).scan(function(node) {
+			if (!cmpStart && node == startDummy) {
+				cmpStart = true;
+				return;
+			}
+			if (node == endDummy) {
+				return false;
+			}
+			if (cmpStart) {
+				nodeList.push(node);
+			}
+		});
+		K(startDummy).remove();
+		K(endDummy).remove();
+		sc = range.startContainer;
+		so = range.startOffset;
+		var ec = range.endContainer, eo = range.endOffset;
+		if (so > 0) {
+			var startBefore = K(sc.childNodes[so - 1]);
+			if (startBefore && _isEmptyNode(startBefore)) {
+				startBefore.remove();
+				range.setStart(sc, so - 1);
+				if (sc == ec) {
+					range.setEnd(ec, eo - 1);
+				}
+			}
+			var startAfter = K(sc.childNodes[so]);
+			if (startAfter && _isEmptyNode(startAfter)) {
+				startAfter.remove();
+				if (sc == ec) {
+					range.setEnd(ec, eo - 1);
+				}
+			}
+		}
+		var endAfter = K(ec.childNodes[range.endOffset]);
+		if (endAfter && _isEmptyNode(endAfter)) {
+			endAfter.remove();
+		}
+		var bookmark = range.createBookmark(true);
+		_each(nodeList, function(i, node) {
+			_removeAttrOrCss(K(node), map);
+		});
+		range.moveToBookmark(bookmark);
+		return self;
+	},
+	commonNode : function(map) {
+		var range = this.range;
+		var ec = range.endContainer, eo = range.endOffset,
+			node = (ec.nodeType == 3 || eo === 0) ? ec : ec.childNodes[eo - 1];
+		function find(node) {
+			var child = node, parent = node;
+			while (parent) {
+				if (_hasAttrOrCss(K(parent), map)) {
+					return K(parent);
+				}
+				parent = parent.parentNode;
+			}
+			while (child && (child = child.lastChild)) {
+				if (_hasAttrOrCss(K(child), map)) {
+					return K(child);
+				}
+			}
+			return null;
+		}
+		var cNode = find(node);
+		if (cNode) {
+			return cNode;
+		}
+		if (node.nodeType == 1 || (ec.nodeType == 3 && eo === 0)) {
+			var prev = K(node).prev();
+			if (prev) {
+				return find(prev);
+			}
+		}
+		return null;
+	},
+	commonAncestor : function(tagName) {
+		var range = this.range,
+			sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset,
+			startNode = (sc.nodeType == 3 || so === 0) ? sc : sc.childNodes[so - 1],
+			endNode = (ec.nodeType == 3 || eo === 0) ? ec : ec.childNodes[eo - 1];
+		function find(node) {
+			while (node) {
+				if (node.nodeType == 1) {
+					if (node.tagName.toLowerCase() === tagName) {
+						return node;
+					}
+				}
+				node = node.parentNode;
+			}
+			return null;
+		}
+		var start = find(startNode), end = find(endNode);
+		if (start && end && start === end) {
+			return K(start);
+		}
+		return null;
+	},
+	state : function(key) {
+		var self = this, doc = self.doc, bool = false;
+		try {
+			bool = doc.queryCommandState(key);
+		} catch (e) {}
+		return bool;
+	},
+	val : function(key) {
+		var self = this, doc = self.doc, range = self.range;
+		function lc(val) {
+			return val.toLowerCase();
+		}
+		key = lc(key);
+		var val = '', knode;
+		if (key === 'fontfamily' || key === 'fontname') {
+			val = _nativeCommandValue(doc, 'fontname');
+			val = val.replace(/['"]/g, '');
+			return lc(val);
+		}
+		if (key === 'formatblock') {
+			val = _nativeCommandValue(doc, key);
+			if (val === '') {
+				knode = self.commonNode({'h1,h2,h3,h4,h5,h6,p,div,pre,address' : '*'});
+				if (knode) {
+					val = knode.name;
+				}
+			}
+			if (val === 'Normal') {
+				val = 'p';
+			}
+			return lc(val);
+		}
+		if (key === 'fontsize') {
+			knode = self.commonNode({'*' : '.font-size'});
+			if (knode) {
+				val = knode.css('font-size');
+			}
+			return lc(val);
+		}
+		if (key === 'forecolor') {
+			knode = self.commonNode({'*' : '.color'});
+			if (knode) {
+				val = knode.css('color');
+			}
+			val = _toHex(val);
+			if (val === '') {
+				val = 'default';
+			}
+			return lc(val);
+		}
+		if (key === 'hilitecolor') {
+			knode = self.commonNode({'*' : '.background-color'});
+			if (knode) {
+				val = knode.css('background-color');
+			}
+			val = _toHex(val);
+			if (val === '') {
+				val = 'default';
+			}
+			return lc(val);
+		}
+		return val;
+	},
+	toggle : function(wrapper, map) {
+		var self = this;
+		if (self.commonNode(map)) {
+			self.remove(map);
+		} else {
+			self.wrap(wrapper);
+		}
+		return self.select();
+	},
+	bold : function() {
+		return this.toggle('<strong></strong>', {
+			span : '.font-weight=bold',
+			strong : '*',
+			b : '*'
+		});
+	},
+	italic : function() {
+		return this.toggle('<em></em>', {
+			span : '.font-style=italic',
+			em : '*',
+			i : '*'
+		});
+	},
+	underline : function() {
+		return this.toggle('<u></u>', {
+			span : '.text-decoration=underline',
+			u : '*'
+		});
+	},
+	strikethrough : function() {
+		return this.toggle('<s></s>', {
+			span : '.text-decoration=line-through',
+			s : '*'
+		});
+	},
+	forecolor : function(val) {
+		return this.wrap('<span style="color:' + val + ';"></span>').select();
+	},
+	hilitecolor : function(val) {
+		return this.wrap('<span style="background-color:' + val + ';"></span>').select();
+	},
+	fontsize : function(val) {
+		return this.wrap('<span style="font-size:' + val + ';"></span>').select();
+	},
+	fontname : function(val) {
+		return this.fontfamily(val);
+	},
+	fontfamily : function(val) {
+		return this.wrap('<span style="font-family:' + val + ';"></span>').select();
+	},
+	removeformat : function() {
+		var map = {
+			'*' : '.font-weight,.font-style,.text-decoration,.color,.background-color,.font-size,.font-family,.text-indent'
+		},
+		tags = _STYLE_TAG_MAP;
+		_each(tags, function(key, val) {
+			map[key] = '*';
+		});
+		this.remove(map);
+		return this.select();
+	},
+	inserthtml : function(val, quickMode) {
+		var self = this, range = self.range;
+		if (val === '') {
+			return self;
+		}
+		function pasteHtml(range, val) {
+			val = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + val;
+			var rng = range.get();
+			if (rng.item) {
+				rng.item(0).outerHTML = val;
+			} else {
+				rng.pasteHTML(val);
+			}
+			var temp = range.doc.getElementById('__kindeditor_temp_tag__');
+			temp.parentNode.removeChild(temp);
+			var newRange = _toRange(rng);
+			range.setEnd(newRange.endContainer, newRange.endOffset);
+			range.collapse(false);
+			self.select(false);
+		}
+		function insertHtml(range, val) {
+			var doc = range.doc,
+				frag = doc.createDocumentFragment();
+			K('@' + val, doc).each(function() {
+				frag.appendChild(this);
+			});
+			range.deleteContents();
+			range.insertNode(frag);
+			range.collapse(false);
+			self.select(false);
+		}
+		if (_IERANGE && quickMode) {
+			try {
+				pasteHtml(range, val);
+			} catch(e) {
+				insertHtml(range, val);
+			}
+			return self;
+		}
+		insertHtml(range, val);
+		return self;
+	},
+	hr : function() {
+		return this.inserthtml('<hr />');
+	},
+	print : function() {
+		this.win.print();
+		return this;
+	},
+	insertimage : function(url, title, width, height, border, align) {
+		title = _undef(title, '');
+		border = _undef(border, 0);
+		var html = '<img src="' + _escape(url) + '" data-ke-src="' + _escape(url) + '" ';
+		if (width) {
+			html += 'width="' + _escape(width) + '" ';
+		}
+		if (height) {
+			html += 'height="' + _escape(height) + '" ';
+		}
+		if (title) {
+			html += 'title="' + _escape(title) + '" ';
+		}
+		if (align) {
+			html += 'align="' + _escape(align) + '" ';
+		}
+		html += 'alt="' + _escape(title) + '" ';
+		html += '/>';
+		return this.inserthtml(html);
+	},
+	createlink : function(url, type) {
+		var self = this, doc = self.doc, range = self.range;
+		self.select();
+		var a = self.commonNode({ a : '*' });
+		if (a && !range.isControl()) {
+			range.selectNode(a.get());
+			self.select();
+		}
+		var html = '<a href="' + _escape(url) + '" data-ke-src="' + _escape(url) + '" ';
+		if (type) {
+			html += ' target="' + _escape(type) + '"';
+		}
+		if (range.collapsed) {
+			html += '>' + _escape(url) + '</a>';
+			return self.inserthtml(html);
+		}
+		if (range.isControl()) {
+			var node = K(range.startContainer.childNodes[range.startOffset]);
+			html += '></a>';
+			node.after(K(html, doc));
+			node.next().append(node);
+			range.selectNode(node[0]);
+			return self.select();
+		}
+		function setAttr(node, url, type) {
+			K(node).attr('href', url).attr('data-ke-src', url);
+			if (type) {
+				K(node).attr('target', type);
+			} else {
+				K(node).removeAttr('target');
+			}
+		}
+		var sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset;
+		if (sc.nodeType == 1 && sc === ec && so + 1 === eo) {
+			var child = sc.childNodes[so];
+			if (child.nodeName.toLowerCase() == 'a') {
+				setAttr(child, url, type);
+				return self;
+			}
+		}
+		_nativeCommand(doc, 'createlink', '__kindeditor_temp_url__');
+		K('a[href="__kindeditor_temp_url__"]', doc).each(function() {
+			setAttr(this, url, type);
+		});
+		return self;
+	},
+	unlink : function() {
+		var self = this, doc = self.doc, range = self.range;
+		self.select();
+		if (range.collapsed) {
+			var a = self.commonNode({ a : '*' });
+			if (a) {
+				range.selectNode(a.get());
+				self.select();
+			}
+			_nativeCommand(doc, 'unlink', null);
+			if (_WEBKIT && K(range.startContainer).name === 'img') {
+				var parent = K(range.startContainer).parent();
+				if (parent.name === 'a') {
+					parent.remove(true);
+				}
+			}
+		} else {
+			_nativeCommand(doc, 'unlink', null);
+		}
+		return self;
+	}
+});
+_each(('formatblock,selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,' +
+	'insertunorderedlist,indent,outdent,subscript,superscript').split(','), function(i, name) {
+	KCmd.prototype[name] = function(val) {
+		var self = this;
+		self.select();
+		_nativeCommand(self.doc, name, val);
+		if (_IERANGE && _inArray(name, 'justifyleft,justifycenter,justifyright,justifyfull'.split(',')) >= 0) {
+			self.selection();
+		}
+		if (!_IERANGE || _inArray(name, 'formatblock,selectall,insertorderedlist,insertunorderedlist'.split(',')) >= 0) {
+			self.selection();
+		}
+		return self;
+	};
+});
+_each('cut,copy,paste'.split(','), function(i, name) {
+	KCmd.prototype[name] = function() {
+		var self = this;
+		if (!self.doc.queryCommandSupported(name)) {
+			throw 'not supported';
+		}
+		self.select();
+		_nativeCommand(self.doc, name, null);
+		return self;
+	};
+});
+function _cmd(mixed) {
+	if (mixed.nodeName) {
+		var doc = _getDoc(mixed);
+		mixed = _range(doc).selectNodeContents(doc.body).collapse(false);
+	}
+	return new KCmd(mixed);
+}
+K.CmdClass = KCmd;
+K.cmd = _cmd;
+function _drag(options) {
+	var moveEl = options.moveEl,
+		moveFn = options.moveFn,
+		clickEl = options.clickEl || moveEl,
+		beforeDrag = options.beforeDrag,
+		iframeFix = options.iframeFix === undefined ? true : options.iframeFix;
+	var docs = [document];
+	if (iframeFix) {
+		K('iframe').each(function() {
+			var src = _formatUrl(this.src || '', 'absolute');
+			if (/^https?:\/\//.test(src)) {
+				return;
+			}
+			var doc;
+			try {
+				doc = _iframeDoc(this);
+			} catch(e) {}
+			if (doc) {
+				var pos = K(this).pos();
+				K(doc).data('pos-x', pos.x);
+				K(doc).data('pos-y', pos.y);
+				docs.push(doc);
+			}
+		});
+	}
+	clickEl.mousedown(function(e) {
+		e.stopPropagation();
+		var self = clickEl.get(),
+			x = _removeUnit(moveEl.css('left')),
+			y = _removeUnit(moveEl.css('top')),
+			width = moveEl.width(),
+			height = moveEl.height(),
+			pageX = e.pageX,
+			pageY = e.pageY;
+		if (beforeDrag) {
+			beforeDrag();
+		}
+		function moveListener(e) {
+			e.preventDefault();
+			var kdoc = K(_getDoc(e.target));
+			var diffX = _round((kdoc.data('pos-x') || 0) + e.pageX - pageX);
+			var diffY = _round((kdoc.data('pos-y') || 0) + e.pageY - pageY);
+			moveFn.call(clickEl, x, y, width, height, diffX, diffY);
+		}
+		function selectListener(e) {
+			e.preventDefault();
+		}
+		function upListener(e) {
+			e.preventDefault();
+			K(docs).unbind('mousemove', moveListener)
+				.unbind('mouseup', upListener)
+				.unbind('selectstart', selectListener);
+			if (self.releaseCapture) {
+				self.releaseCapture();
+			}
+		}
+		K(docs).mousemove(moveListener)
+			.mouseup(upListener)
+			.bind('selectstart', selectListener);
+		if (self.setCapture) {
+			self.setCapture();
+		}
+	});
+}
+function KWidget(options) {
+	this.init(options);
+}
+_extend(KWidget, {
+	init : function(options) {
+		var self = this;
+		self.name = options.name || '';
+		self.doc = options.doc || document;
+		self.win = _getWin(self.doc);
+		self.x = _addUnit(options.x);
+		self.y = _addUnit(options.y);
+		self.z = options.z;
+		self.width = _addUnit(options.width);
+		self.height = _addUnit(options.height);
+		self.div = K('<div style="display:block;"></div>');
+		self.options = options;
+		self._alignEl = options.alignEl;
+		if (self.width) {
+			self.div.css('width', self.width);
+		}
+		if (self.height) {
+			self.div.css('height', self.height);
+		}
+		if (self.z) {
+			self.div.css({
+				position : 'absolute',
+				left : self.x,
+				top : self.y,
+				'z-index' : self.z
+			});
+		}
+		if (self.z && (self.x === undefined || self.y === undefined)) {
+			self.autoPos(self.width, self.height);
+		}
+		if (options.cls) {
+			self.div.addClass(options.cls);
+		}
+		if (options.shadowMode) {
+			self.div.addClass('ke-shadow');
+		}
+		if (options.css) {
+			self.div.css(options.css);
+		}
+		if (options.src) {
+			K(options.src).replaceWith(self.div);
+		} else {
+			K(self.doc.body).append(self.div);
+		}
+		if (options.html) {
+			self.div.html(options.html);
+		}
+		if (options.autoScroll) {
+			if (_IE && _V < 7 || _QUIRKS) {
+				var scrollPos = _getScrollPos();
+				K(self.win).bind('scroll', function(e) {
+					var pos = _getScrollPos(),
+						diffX = pos.x - scrollPos.x,
+						diffY = pos.y - scrollPos.y;
+					self.pos(_removeUnit(self.x) + diffX, _removeUnit(self.y) + diffY, false);
+				});
+			} else {
+				self.div.css('position', 'fixed');
+			}
+		}
+	},
+	pos : function(x, y, updateProp) {
+		var self = this;
+		updateProp = _undef(updateProp, true);
+		if (x !== null) {
+			x = x < 0 ? 0 : _addUnit(x);
+			self.div.css('left', x);
+			if (updateProp) {
+				self.x = x;
+			}
+		}
+		if (y !== null) {
+			y = y < 0 ? 0 : _addUnit(y);
+			self.div.css('top', y);
+			if (updateProp) {
+				self.y = y;
+			}
+		}
+		return self;
+	},
+	autoPos : function(width, height) {
+		var self = this,
+			w = _removeUnit(width) || 0,
+			h = _removeUnit(height) || 0,
+			scrollPos = _getScrollPos();
+		if (self._alignEl) {
+			var knode = K(self._alignEl),
+				pos = knode.pos(),
+				diffX = _round(knode[0].clientWidth / 2 - w / 2),
+				diffY = _round(knode[0].clientHeight / 2 - h / 2);
+			x = diffX < 0 ? pos.x : pos.x + diffX;
+			y = diffY < 0 ? pos.y : pos.y + diffY;
+		} else {
+			var docEl = _docElement(self.doc);
+			x = _round(scrollPos.x + (docEl.clientWidth - w) / 2);
+			y = _round(scrollPos.y + (docEl.clientHeight - h) / 2);
+		}
+		if (!(_IE && _V < 7 || _QUIRKS)) {
+			x -= scrollPos.x;
+			y -= scrollPos.y;
+		}
+		return self.pos(x, y);
+	},
+	remove : function() {
+		var self = this;
+		if (_IE && _V < 7 || _QUIRKS) {
+			K(self.win).unbind('scroll');
+		}
+		self.div.remove();
+		_each(self, function(i) {
+			self[i] = null;
+		});
+		return this;
+	},
+	show : function() {
+		this.div.show();
+		return this;
+	},
+	hide : function() {
+		this.div.hide();
+		return this;
+	},
+	draggable : function(options) {
+		var self = this;
+		options = options || {};
+		options.moveEl = self.div;
+		options.moveFn = function(x, y, width, height, diffX, diffY) {
+			if ((x = x + diffX) < 0) {
+				x = 0;
+			}
+			if ((y = y + diffY) < 0) {
+				y = 0;
+			}
+			self.pos(x, y);
+		};
+		_drag(options);
+		return self;
+	}
+});
+function _widget(options) {
+	return new KWidget(options);
+}
+K.WidgetClass = KWidget;
+K.widget = _widget;
+function _iframeDoc(iframe) {
+	iframe = _get(iframe);
+	return iframe.contentDocument || iframe.contentWindow.document;
+}
+var html, _direction = '';
+if ((html = document.getElementsByTagName('html'))) {
+	_direction = html[0].dir;
+}
+function _getInitHtml(themesPath, bodyClass, cssPath, cssData) {
+	var arr = [
+		(_direction === '' ? '<html>' : '<html dir="' + _direction + '">'),
+		'<head><meta charset="utf-8" /><title></title>',
+		'<style>',
+		'html {margin:0;padding:0;}',
+		'body {margin:0;padding:5px;}',
+		'body, td {font:12px/1.5 "sans serif",tahoma,verdana,helvetica;}',
+		'body, p, div {word-wrap: break-word;}',
+		'p {margin:5px 0;}',
+		'table {border-collapse:collapse;}',
+		'img {border:0;}',
+		'noscript {display:none;}',
+		'table.ke-zeroborder td {border:1px dotted #AAA;}',
+		'img.ke-flash {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/flash.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-rm {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/rm.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-media {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/media.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-anchor {',
+		'	border:1px dashed #666;',
+		'	width:16px;',
+		'	height:16px;',
+		'}',
+		'.ke-script, .ke-noscript, .ke-display-none {',
+		'	display:none;',
+		'	font-size:0;',
+		'	width:0;',
+		'	height:0;',
+		'}',
+		'.ke-pagebreak {',
+		'	border:1px dotted #AAA;',
+		'	font-size:0;',
+		'	height:2px;',
+		'}',
+		'</style>'
+	];
+	if (!_isArray(cssPath)) {
+		cssPath = [cssPath];
+	}
+	_each(cssPath, function(i, path) {
+		if (path) {
+			arr.push('<link href="' + path + '" rel="stylesheet" />');
+		}
+	});
+	if (cssData) {
+		arr.push('<style>' + cssData + '</style>');
+	}
+	arr.push('</head><body ' + (bodyClass ? 'class="' + bodyClass + '"' : '') + '></body></html>');
+	return arr.join('\n');
+}
+function _elementVal(knode, val) {
+	if (knode.hasVal()) {
+		if (val === undefined) {
+			var html = knode.val();
+			html = html.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig, '');
+			return html;
+		}
+		return knode.val(val);
+	}
+	return knode.html(val);
+}
+function KEdit(options) {
+	this.init(options);
+}
+_extend(KEdit, KWidget, {
+	init : function(options) {
+		var self = this;
+		KEdit.parent.init.call(self, options);
+		self.srcElement = K(options.srcElement);
+		self.div.addClass('ke-edit');
+		self.designMode = _undef(options.designMode, true);
+		self.beforeGetHtml = options.beforeGetHtml;
+		self.beforeSetHtml = options.beforeSetHtml;
+		self.afterSetHtml = options.afterSetHtml;
+		var themesPath = _undef(options.themesPath, ''),
+			bodyClass = options.bodyClass,
+			cssPath = options.cssPath,
+			cssData = options.cssData,
+			isDocumentDomain = location.protocol != 'res:' && location.host.replace(/:\d+/, '') !== document.domain,
+			srcScript = ('document.open();' +
+				(isDocumentDomain ? 'document.domain="' + document.domain + '";' : '') +
+				'document.close();'),
+			iframeSrc = _IE ? ' src="javascript:void(function(){' + encodeURIComponent(srcScript) + '}())"' : '';
+		self.iframe = K('<iframe class="ke-edit-iframe" hidefocus="true" frameborder="0"' + iframeSrc + '></iframe>').css('width', '100%');
+		self.textarea = K('<textarea class="ke-edit-textarea" hidefocus="true"></textarea>').css('width', '100%');
+		self.tabIndex = isNaN(parseInt(options.tabIndex, 10)) ? self.srcElement.attr('tabindex') : parseInt(options.tabIndex, 10);
+		self.iframe.attr('tabindex', self.tabIndex);
+		self.textarea.attr('tabindex', self.tabIndex);
+		if (self.width) {
+			self.setWidth(self.width);
+		}
+		if (self.height) {
+			self.setHeight(self.height);
+		}
+		if (self.designMode) {
+			self.textarea.hide();
+		} else {
+			self.iframe.hide();
+		}
+		function ready() {
+			var doc = _iframeDoc(self.iframe);
+			doc.open();
+			if (isDocumentDomain) {
+				doc.domain = document.domain;
+			}
+			doc.write(_getInitHtml(themesPath, bodyClass, cssPath, cssData));
+			doc.close();
+			self.win = self.iframe[0].contentWindow;
+			self.doc = doc;
+			var cmd = _cmd(doc);
+			self.afterChange(function(e) {
+				cmd.selection();
+			});
+			if (_WEBKIT) {
+				K(doc).click(function(e) {
+					if (K(e.target).name === 'img') {
+						cmd.selection(true);
+						cmd.range.selectNode(e.target);
+						cmd.select();
+					}
+				});
+			}
+			if (_IE) {
+				self._mousedownHandler = function() {
+					var newRange = cmd.range.cloneRange();
+					newRange.shrink();
+					if (newRange.isControl()) {
+						self.blur();
+					}
+				};
+				K(document).mousedown(self._mousedownHandler);
+				K(doc).keydown(function(e) {
+					if (e.which == 8) {
+						cmd.selection();
+						var rng = cmd.range;
+						if (rng.isControl()) {
+							rng.collapse(true);
+							K(rng.startContainer.childNodes[rng.startOffset]).remove();
+							e.preventDefault();
+						}
+					}
+				});
+			}
+			self.cmd = cmd;
+			self.html(_elementVal(self.srcElement));
+			if (_IE) {
+				doc.body.disabled = true;
+				doc.body.contentEditable = true;
+				doc.body.removeAttribute('disabled');
+			} else {
+				doc.designMode = 'on';
+			}
+			if (options.afterCreate) {
+				options.afterCreate.call(self);
+			}
+		}
+		if (isDocumentDomain) {
+			self.iframe.bind('load', function(e) {
+				self.iframe.unbind('load');
+				if (_IE) {
+					ready();
+				} else {
+					setTimeout(ready, 0);
+				}
+			});
+		}
+		self.div.append(self.iframe);
+		self.div.append(self.textarea);
+		self.srcElement.hide();
+		!isDocumentDomain && ready();
+	},
+	setWidth : function(val) {
+		var self = this;
+		val = _addUnit(val);
+		self.width = val;
+		self.div.css('width', val);
+		return self;
+	},
+	setHeight : function(val) {
+		var self = this;
+		val = _addUnit(val);
+		self.height = val;
+		self.div.css('height', val);
+		self.iframe.css('height', val);
+		if ((_IE && _V < 8) || _QUIRKS) {
+			val = _addUnit(_removeUnit(val) - 2);
+		}
+		self.textarea.css('height', val);
+		return self;
+	},
+	remove : function() {
+		var self = this, doc = self.doc;
+		K(doc.body).unbind();
+		K(doc).unbind();
+		K(self.win).unbind();
+		if (self._mousedownHandler) {
+			K(document).unbind('mousedown', self._mousedownHandler);
+		}
+		_elementVal(self.srcElement, self.html());
+		self.srcElement.show();
+		doc.write('');
+		self.iframe.unbind();
+		self.textarea.unbind();
+		KEdit.parent.remove.call(self);
+	},
+	html : function(val, isFull) {
+		var self = this, doc = self.doc;
+		if (self.designMode) {
+			var body = doc.body;
+			if (val === undefined) {
+				if (isFull) {
+					val = '<!doctype html><html>' + body.parentNode.innerHTML + '</html>';
+				} else {
+					val = body.innerHTML;
+				}
+				if (self.beforeGetHtml) {
+					val = self.beforeGetHtml(val);
+				}
+				if (_GECKO && val == '<br />') {
+					val = '';
+				}
+				return val;
+			}
+			if (self.beforeSetHtml) {
+				val = self.beforeSetHtml(val);
+			}
+			if (_IE && _V >= 9) {
+				val = val.replace(/(<.*?checked=")checked(".*>)/ig, '$1$2');
+			}
+			K(body).html(val);
+			if (self.afterSetHtml) {
+				self.afterSetHtml();
+			}
+			return self;
+		}
+		if (val === undefined) {
+			return self.textarea.val();
+		}
+		self.textarea.val(val);
+		return self;
+	},
+	design : function(bool) {
+		var self = this, val;
+		if (bool === undefined ? !self.designMode : bool) {
+			if (!self.designMode) {
+				val = self.html();
+				self.designMode = true;
+				self.html(val);
+				self.textarea.hide();
+				self.iframe.show();
+			}
+		} else {
+			if (self.designMode) {
+				val = self.html();
+				self.designMode = false;
+				self.html(val);
+				self.iframe.hide();
+				self.textarea.show();
+			}
+		}
+		return self.focus();
+	},
+	focus : function() {
+		var self = this;
+		self.designMode ? self.win.focus() : self.textarea[0].focus();
+		return self;
+	},
+	blur : function() {
+		var self = this;
+		if (_IE) {
+			var input = K('<input type="text" style="float:left;width:0;height:0;padding:0;margin:0;border:0;" value="" />', self.div);
+			self.div.append(input);
+			input[0].focus();
+			input.remove();
+		} else {
+			self.designMode ? self.win.blur() : self.textarea[0].blur();
+		}
+		return self;
+	},
+	afterChange : function(fn) {
+		var self = this, doc = self.doc, body = doc.body;
+		K(doc).keyup(function(e) {
+			if (!e.ctrlKey && !e.altKey && _CHANGE_KEY_MAP[e.which]) {
+				fn(e);
+			}
+		});
+		K(doc).mouseup(fn).contextmenu(fn);
+		K(self.win).blur(fn);
+		function timeoutHandler(e) {
+			setTimeout(function() {
+				fn(e);
+			}, 1);
+		}
+		K(body).bind('paste', timeoutHandler);
+		K(body).bind('cut', timeoutHandler);
+		return self;
+	}
+});
+function _edit(options) {
+	return new KEdit(options);
+}
+K.EditClass = KEdit;
+K.edit = _edit;
+K.iframeDoc = _iframeDoc;
+function _selectToolbar(name, fn) {
+	var self = this,
+		knode = self.get(name);
+	if (knode) {
+		if (knode.hasClass('ke-disabled')) {
+			return;
+		}
+		fn(knode);
+	}
+}
+function KToolbar(options) {
+	this.init(options);
+}
+_extend(KToolbar, KWidget, {
+	init : function(options) {
+		var self = this;
+		KToolbar.parent.init.call(self, options);
+		self.disableMode = _undef(options.disableMode, false);
+		self.noDisableItemMap = _toMap(_undef(options.noDisableItems, []));
+		self._itemMap = {};
+		self.div.addClass('ke-toolbar').bind('contextmenu,mousedown,mousemove', function(e) {
+			e.preventDefault();
+		}).attr('unselectable', 'on');
+		function find(target) {
+			var knode = K(target);
+			if (knode.hasClass('ke-outline')) {
+				return knode;
+			}
+			if (knode.hasClass('ke-toolbar-icon')) {
+				return knode.parent();
+			}
+		}
+		function hover(e, method) {
+			var knode = find(e.target);
+			if (knode) {
+				if (knode.hasClass('ke-disabled')) {
+					return;
+				}
+				if (knode.hasClass('ke-selected')) {
+					return;
+				}
+				knode[method]('ke-on');
+			}
+		}
+		self.div.mouseover(function(e) {
+			hover(e, 'addClass');
+		})
+		.mouseout(function(e) {
+			hover(e, 'removeClass');
+		})
+		.click(function(e) {
+			var knode = find(e.target);
+			if (knode) {
+				if (knode.hasClass('ke-disabled')) {
+					return;
+				}
+				self.options.click.call(this, e, knode.attr('data-name'));
+			}
+		});
+	},
+	get : function(name) {
+		if (this._itemMap[name]) {
+			return this._itemMap[name];
+		}
+		return (this._itemMap[name] = K('span.ke-icon-' + name, this.div).parent());
+	},
+	select : function(name) {
+		_selectToolbar.call(this, name, function(knode) {
+			knode.addClass('ke-selected');
+		});
+		return self;
+	},
+	unselect : function(name) {
+		_selectToolbar.call(this, name, function(knode) {
+			knode.removeClass('ke-selected').removeClass('ke-on');
+		});
+		return self;
+	},
+	enable : function(name) {
+		var self = this,
+			knode = name.get ? name : self.get(name);
+		if (knode) {
+			knode.removeClass('ke-disabled');
+			knode.opacity(1);
+		}
+		return self;
+	},
+	disable : function(name) {
+		var self = this,
+			knode = name.get ? name : self.get(name);
+		if (knode) {
+			knode.removeClass('ke-selected').addClass('ke-disabled');
+			knode.opacity(0.5);
+		}
+		return self;
+	},
+	disableAll : function(bool, noDisableItems) {
+		var self = this, map = self.noDisableItemMap, item;
+		if (noDisableItems) {
+			map = _toMap(noDisableItems);
+		}
+		if (bool === undefined ? !self.disableMode : bool) {
+			K('span.ke-outline', self.div).each(function() {
+				var knode = K(this),
+					name = knode[0].getAttribute('data-name', 2);
+				if (!map[name]) {
+					self.disable(knode);
+				}
+			});
+			self.disableMode = true;
+		} else {
+			K('span.ke-outline', self.div).each(function() {
+				var knode = K(this),
+					name = knode[0].getAttribute('data-name', 2);
+				if (!map[name]) {
+					self.enable(knode);
+				}
+			});
+			self.disableMode = false;
+		}
+		return self;
+	}
+});
+function _toolbar(options) {
+	return new KToolbar(options);
+}
+K.ToolbarClass = KToolbar;
+K.toolbar = _toolbar;
+function KMenu(options) {
+	this.init(options);
+}
+_extend(KMenu, KWidget, {
+	init : function(options) {
+		var self = this;
+		options.z = options.z || 811213;
+		KMenu.parent.init.call(self, options);
+		self.centerLineMode = _undef(options.centerLineMode, true);
+		self.div.addClass('ke-menu').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		}).attr('unselectable', 'on');
+	},
+	addItem : function(item) {
+		var self = this;
+		if (item.title === '-') {
+			self.div.append(K('<div class="ke-menu-separator"></div>'));
+			return;
+		}
+		var itemDiv = K('<div class="ke-menu-item" unselectable="on"></div>'),
+			leftDiv = K('<div class="ke-inline-block ke-menu-item-left"></div>'),
+			rightDiv = K('<div class="ke-inline-block ke-menu-item-right"></div>'),
+			height = _addUnit(item.height),
+			iconClass = _undef(item.iconClass, '');
+		self.div.append(itemDiv);
+		if (height) {
+			itemDiv.css('height', height);
+			rightDiv.css('line-height', height);
+		}
+		var centerDiv;
+		if (self.centerLineMode) {
+			centerDiv = K('<div class="ke-inline-block ke-menu-item-center"></div>');
+			if (height) {
+				centerDiv.css('height', height);
+			}
+		}
+		itemDiv.mouseover(function(e) {
+			K(this).addClass('ke-menu-item-on');
+			if (centerDiv) {
+				centerDiv.addClass('ke-menu-item-center-on');
+			}
+		})
+		.mouseout(function(e) {
+			K(this).removeClass('ke-menu-item-on');
+			if (centerDiv) {
+				centerDiv.removeClass('ke-menu-item-center-on');
+			}
+		})
+		.click(function(e) {
+			item.click.call(K(this));
+			e.stopPropagation();
+		})
+		.append(leftDiv);
+		if (centerDiv) {
+			itemDiv.append(centerDiv);
+		}
+		itemDiv.append(rightDiv);
+		if (item.checked) {
+			iconClass = 'ke-icon-checked';
+		}
+		if (iconClass !== '') {
+			leftDiv.html('<span class="ke-inline-block ke-toolbar-icon ke-toolbar-icon-url ' + iconClass + '"></span>');
+		}
+		rightDiv.html(item.title);
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (self.options.beforeRemove) {
+			self.options.beforeRemove.call(self);
+		}
+		K('.ke-menu-item', self.div[0]).unbind();
+		KMenu.parent.remove.call(self);
+		return self;
+	}
+});
+function _menu(options) {
+	return new KMenu(options);
+}
+K.MenuClass = KMenu;
+K.menu = _menu;
+function KColorPicker(options) {
+	this.init(options);
+}
+_extend(KColorPicker, KWidget, {
+	init : function(options) {
+		var self = this;
+		options.z = options.z || 811213;
+		KColorPicker.parent.init.call(self, options);
+		var colors = options.colors || [
+			['#E53333', '#E56600', '#FF9900', '#64451D', '#DFC5A4', '#FFE500'],
+			['#009900', '#006600', '#99BB00', '#B8D100', '#60D978', '#00D5FF'],
+			['#337FE5', '#003399', '#4C33E5', '#9933E5', '#CC33E5', '#EE33EE'],
+			['#FFFFFF', '#CCCCCC', '#999999', '#666666', '#333333', '#000000']
+		];
+		self.selectedColor = (options.selectedColor || '').toLowerCase();
+		self._cells = [];
+		self.div.addClass('ke-colorpicker').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		}).attr('unselectable', 'on');
+		var table = self.doc.createElement('table');
+		self.div.append(table);
+		table.className = 'ke-colorpicker-table';
+		table.cellPadding = 0;
+		table.cellSpacing = 0;
+		table.border = 0;
+		var row = table.insertRow(0), cell = row.insertCell(0);
+		cell.colSpan = colors[0].length;
+		self._addAttr(cell, '', 'ke-colorpicker-cell-top');
+		for (var i = 0; i < colors.length; i++) {
+			row = table.insertRow(i + 1);
+			for (var j = 0; j < colors[i].length; j++) {
+				cell = row.insertCell(j);
+				self._addAttr(cell, colors[i][j], 'ke-colorpicker-cell');
+			}
+		}
+	},
+	_addAttr : function(cell, color, cls) {
+		var self = this;
+		cell = K(cell).addClass(cls);
+		if (self.selectedColor === color.toLowerCase()) {
+			cell.addClass('ke-colorpicker-cell-selected');
+		}
+		cell.attr('title', color || self.options.noColor);
+		cell.mouseover(function(e) {
+			K(this).addClass('ke-colorpicker-cell-on');
+		});
+		cell.mouseout(function(e) {
+			K(this).removeClass('ke-colorpicker-cell-on');
+		});
+		cell.click(function(e) {
+			e.stop();
+			self.options.click.call(K(this), color);
+		});
+		if (color) {
+			cell.append(K('<div class="ke-colorpicker-cell-color" unselectable="on"></div>').css('background-color', color));
+		} else {
+			cell.html(self.options.noColor);
+		}
+		K(cell).attr('unselectable', 'on');
+		self._cells.push(cell);
+	},
+	remove : function() {
+		var self = this;
+		_each(self._cells, function() {
+			this.unbind();
+		});
+		KColorPicker.parent.remove.call(self);
+		return self;
+	}
+});
+function _colorpicker(options) {
+	return new KColorPicker(options);
+}
+K.ColorPickerClass = KColorPicker;
+K.colorpicker = _colorpicker;
+function KUploadButton(options) {
+	this.init(options);
+}
+_extend(KUploadButton, {
+	init : function(options) {
+		var self = this,
+			button = K(options.button),
+			fieldName = options.fieldName || 'file',
+			url = options.url || '',
+			title = button.val(),
+			extraParams = options.extraParams || {},
+			cls = button[0].className || '',
+			target = options.target || 'kindeditor_upload_iframe_' + new Date().getTime();
+		options.afterError = options.afterError || function(str) {
+			alert(str);
+		};
+		var hiddenElements = [];
+		for(var k in extraParams){
+			hiddenElements.push('<input type="hidden" name="' + k + '" value="' + extraParams[k] + '" />');
+		}
+		var html = [
+			'<div class="ke-inline-block ' + cls + '">',
+			(options.target ? '' : '<iframe name="' + target + '" style="display:none;"></iframe>'),
+			(options.form ? '<div class="ke-upload-area">' : '<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="' + target + '" action="' + url + '">'),
+			'<span class="ke-button-common">',
+			hiddenElements.join(''),
+			'<input type="button" class="ke-button-common ke-button" value="' + title + '" />',
+			'</span>',
+			'<input type="file" class="ke-upload-file" name="' + fieldName + '" tabindex="-1" />',
+			(options.form ? '</div>' : '</form>'),
+			'</div>'].join('');
+		var div = K(html, button.doc);
+		button.hide();
+		button.before(div);
+		self.div = div;
+		self.button = button;
+		self.iframe = options.target ? K('iframe[name="' + target + '"]') : K('iframe', div);
+		self.form = options.form ? K(options.form) : K('form', div);
+		self.fileBox = K('.ke-upload-file', div);
+		var width = options.width || K('.ke-button-common', div).width();
+		K('.ke-upload-area', div).width(width);
+		self.options = options;
+	},
+	submit : function() {
+		var self = this,
+			iframe = self.iframe;
+		iframe.bind('load', function() {
+			iframe.unbind();
+			var tempForm = document.createElement('form');
+			self.fileBox.before(tempForm);
+			K(tempForm).append(self.fileBox);
+			tempForm.reset();
+			K(tempForm).remove(true);
+			var doc = K.iframeDoc(iframe),
+				pre = doc.getElementsByTagName('pre')[0],
+				str = '', data;
+			if (pre) {
+				str = pre.innerHTML;
+			} else {
+				str = doc.body.innerHTML;
+			}
+			str = _unescape(str);
+			iframe[0].src = 'javascript:false';
+			try {
+				data = K.json(str);
+			} catch (e) {
+				self.options.afterError.call(self, '<!doctype html><html>' + doc.body.parentNode.innerHTML + '</html>');
+			}
+			if (data) {
+				self.options.afterUpload.call(self, data);
+			}
+		});
+		self.form[0].submit();
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (self.fileBox) {
+			self.fileBox.unbind();
+		}
+		self.iframe.remove();
+		self.div.remove();
+		self.button.show();
+		return self;
+	}
+});
+function _uploadbutton(options) {
+	return new KUploadButton(options);
+}
+K.UploadButtonClass = KUploadButton;
+K.uploadbutton = _uploadbutton;
+function _createButton(arg) {
+	arg = arg || {};
+	var name = arg.name || '',
+		span = K('<span class="ke-button-common ke-button-outer" title="' + name + '"></span>'),
+		btn = K('<input class="ke-button-common ke-button" type="button" value="' + name + '" />');
+	if (arg.click) {
+		btn.click(arg.click);
+	}
+	span.append(btn);
+	return span;
+}
+function KDialog(options) {
+	this.init(options);
+}
+_extend(KDialog, KWidget, {
+	init : function(options) {
+		var self = this;
+		var shadowMode = _undef(options.shadowMode, true);
+		options.z = options.z || 811213;
+		options.shadowMode = false;
+		options.autoScroll = _undef(options.autoScroll, true);
+		KDialog.parent.init.call(self, options);
+		var title = options.title,
+			body = K(options.body, self.doc),
+			previewBtn = options.previewBtn,
+			yesBtn = options.yesBtn,
+			noBtn = options.noBtn,
+			closeBtn = options.closeBtn,
+			showMask = _undef(options.showMask, true);
+		self.div.addClass('ke-dialog').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		});
+		var contentDiv = K('<div class="ke-dialog-content"></div>').appendTo(self.div);
+		if (_IE && _V < 7) {
+			self.iframeMask = K('<iframe src="about:blank" class="ke-dialog-shadow"></iframe>').appendTo(self.div);
+		} else if (shadowMode) {
+			K('<div class="ke-dialog-shadow"></div>').appendTo(self.div);
+		}
+		var headerDiv = K('<div class="ke-dialog-header"></div>');
+		contentDiv.append(headerDiv);
+		headerDiv.html(title);
+		self.closeIcon = K('<span class="ke-dialog-icon-close" title="' + closeBtn.name + '"></span>').click(closeBtn.click);
+		headerDiv.append(self.closeIcon);
+		self.draggable({
+			clickEl : headerDiv,
+			beforeDrag : options.beforeDrag
+		});
+		var bodyDiv = K('<div class="ke-dialog-body"></div>');
+		contentDiv.append(bodyDiv);
+		bodyDiv.append(body);
+		var footerDiv = K('<div class="ke-dialog-footer"></div>');
+		if (previewBtn || yesBtn || noBtn) {
+			contentDiv.append(footerDiv);
+		}
+		_each([
+			{ btn : previewBtn, name : 'preview' },
+			{ btn : yesBtn, name : 'yes' },
+			{ btn : noBtn, name : 'no' }
+		], function() {
+			if (this.btn) {
+				var button = _createButton(this.btn);
+				button.addClass('ke-dialog-' + this.name);
+				footerDiv.append(button);
+			}
+		});
+		if (self.height) {
+			bodyDiv.height(_removeUnit(self.height) - headerDiv.height() - footerDiv.height());
+		}
+		self.div.width(self.div.width());
+		self.div.height(self.div.height());
+		self.mask = null;
+		if (showMask) {
+			var docEl = _docElement(self.doc),
+				docWidth = Math.max(docEl.scrollWidth, docEl.clientWidth),
+				docHeight = Math.max(docEl.scrollHeight, docEl.clientHeight);
+			self.mask = _widget({
+				x : 0,
+				y : 0,
+				z : self.z - 1,
+				cls : 'ke-dialog-mask',
+				width : docWidth,
+				height : docHeight
+			});
+		}
+		self.autoPos(self.div.width(), self.div.height());
+		self.footerDiv = footerDiv;
+		self.bodyDiv = bodyDiv;
+		self.headerDiv = headerDiv;
+		self.isLoading = false;
+	},
+	setMaskIndex : function(z) {
+		var self = this;
+		self.mask.div.css('z-index', z);
+	},
+	showLoading : function(msg) {
+		msg = _undef(msg, '');
+		var self = this, body = self.bodyDiv;
+		self.loading = K('<div class="ke-dialog-loading"><div class="ke-inline-block ke-dialog-loading-content" style="margin-top:' + Math.round(body.height() / 3) + 'px;">' + msg + '</div></div>')
+			.width(body.width()).height(body.height())
+			.css('top', self.headerDiv.height() + 'px');
+		body.css('visibility', 'hidden').after(self.loading);
+		self.isLoading = true;
+		return self;
+	},
+	hideLoading : function() {
+		this.loading && this.loading.remove();
+		this.bodyDiv.css('visibility', 'visible');
+		this.isLoading = false;
+		return this;
+	},
+	remove : function() {
+		var self = this;
+		if (self.options.beforeRemove) {
+			self.options.beforeRemove.call(self);
+		}
+		self.mask && self.mask.remove();
+		self.iframeMask && self.iframeMask.remove();
+		self.closeIcon.unbind();
+		K('input', self.div).unbind();
+		K('button', self.div).unbind();
+		self.footerDiv.unbind();
+		self.bodyDiv.unbind();
+		self.headerDiv.unbind();
+		K('iframe', self.div).each(function() {
+			K(this).remove();
+		});
+		KDialog.parent.remove.call(self);
+		return self;
+	}
+});
+function _dialog(options) {
+	return new KDialog(options);
+}
+K.DialogClass = KDialog;
+K.dialog = _dialog;
+function _tabs(options) {
+	var self = _widget(options),
+		remove = self.remove,
+		afterSelect = options.afterSelect,
+		div = self.div,
+		liList = [];
+	div.addClass('ke-tabs')
+		.bind('contextmenu,mousedown,mousemove', function(e) {
+			e.preventDefault();
+		});
+	var ul = K('<ul class="ke-tabs-ul ke-clearfix"></ul>');
+	div.append(ul);
+	self.add = function(tab) {
+		var li = K('<li class="ke-tabs-li">' + tab.title + '</li>');
+		li.data('tab', tab);
+		liList.push(li);
+		ul.append(li);
+	};
+	self.selectedIndex = 0;
+	self.select = function(index) {
+		self.selectedIndex = index;
+		_each(liList, function(i, li) {
+			li.unbind();
+			if (i === index) {
+				li.addClass('ke-tabs-li-selected');
+				K(li.data('tab').panel).show('');
+			} else {
+				li.removeClass('ke-tabs-li-selected').removeClass('ke-tabs-li-on')
+				.mouseover(function() {
+					K(this).addClass('ke-tabs-li-on');
+				})
+				.mouseout(function() {
+					K(this).removeClass('ke-tabs-li-on');
+				})
+				.click(function() {
+					self.select(i);
+				});
+				K(li.data('tab').panel).hide();
+			}
+		});
+		if (afterSelect) {
+			afterSelect.call(self, index);
+		}
+	};
+	self.remove = function() {
+		_each(liList, function() {
+			this.remove();
+		});
+		ul.remove();
+		remove.call(self);
+	};
+	return self;
+}
+K.tabs = _tabs;
+function _loadScript(url, fn) {
+	var head = document.getElementsByTagName('head')[0] || (_QUIRKS ? document.body : document.documentElement),
+		script = document.createElement('script');
+	head.appendChild(script);
+	script.src = url;
+	script.charset = 'utf-8';
+	script.onload = script.onreadystatechange = function() {
+		if (!this.readyState || this.readyState === 'loaded') {
+			if (fn) {
+				fn();
+			}
+			script.onload = script.onreadystatechange = null;
+			head.removeChild(script);
+		}
+	};
+}
+function _chopQuery(url) {
+	var index = url.indexOf('?');
+	return index > 0 ? url.substr(0, index) : url;
+}
+function _loadStyle(url) {
+	var head = document.getElementsByTagName('head')[0] || (_QUIRKS ? document.body : document.documentElement),
+		link = document.createElement('link'),
+		absoluteUrl = _chopQuery(_formatUrl(url, 'absolute'));
+	var links = K('link[rel="stylesheet"]', head);
+	for (var i = 0, len = links.length; i < len; i++) {
+		if (_chopQuery(_formatUrl(links[i].href, 'absolute')) === absoluteUrl) {
+			return;
+		}
+	}
+	head.appendChild(link);
+	link.href = url;
+	link.rel = 'stylesheet';
+}
+function _ajax(url, fn, method, param, dataType) {
+	method = method || 'GET';
+	dataType = dataType || 'json';
+	var xhr = window.XMLHttpRequest ? new window.XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');
+	xhr.open(method, url, true);
+	xhr.onreadystatechange = function () {
+		if (xhr.readyState == 4 && xhr.status == 200) {
+			if (fn) {
+				var data = _trim(xhr.responseText);
+				if (dataType == 'json') {
+					data = _json(data);
+				}
+				fn(data);
+			}
+		}
+	};
+	if (method == 'POST') {
+		var params = [];
+		_each(param, function(key, val) {
+			params.push(encodeURIComponent(key) + '=' + encodeURIComponent(val));
+		});
+		try {
+			xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+		} catch (e) {}
+		xhr.send(params.join('&'));
+	} else {
+		xhr.send(null);
+	}
+}
+K.loadScript = _loadScript;
+K.loadStyle = _loadStyle;
+K.ajax = _ajax;
+var _plugins = {};
+function _plugin(name, fn) {
+	if (name === undefined) {
+		return _plugins;
+	}
+	if (!fn) {
+		return _plugins[name];
+	}
+	_plugins[name] = fn;
+}
+var _language = {};
+function _parseLangKey(key) {
+	var match, ns = 'core';
+	if ((match = /^(\w+)\.(\w+)$/.exec(key))) {
+		ns = match[1];
+		key = match[2];
+	}
+	return { ns : ns, key : key };
+}
+function _lang(mixed, langType) {
+	langType = langType === undefined ? K.options.langType : langType;
+	if (typeof mixed === 'string') {
+		if (!_language[langType]) {
+			return 'no language';
+		}
+		var pos = mixed.length - 1;
+		if (mixed.substr(pos) === '.') {
+			return _language[langType][mixed.substr(0, pos)];
+		}
+		var obj = _parseLangKey(mixed);
+		return _language[langType][obj.ns][obj.key];
+	}
+	_each(mixed, function(key, val) {
+		var obj = _parseLangKey(key);
+		if (!_language[langType]) {
+			_language[langType] = {};
+		}
+		if (!_language[langType][obj.ns]) {
+			_language[langType][obj.ns] = {};
+		}
+		_language[langType][obj.ns][obj.key] = val;
+	});
+}
+function _getImageFromRange(range, fn) {
+	if (range.collapsed) {
+		return;
+	}
+	range = range.cloneRange().up();
+	var sc = range.startContainer, so = range.startOffset;
+	if (!_WEBKIT && !range.isControl()) {
+		return;
+	}
+	var img = K(sc.childNodes[so]);
+	if (!img || img.name != 'img') {
+		return;
+	}
+	if (fn(img)) {
+		return img;
+	}
+}
+function _bindContextmenuEvent() {
+	var self = this, doc = self.edit.doc;
+	K(doc).contextmenu(function(e) {
+		if (self.menu) {
+			self.hideMenu();
+		}
+		if (!self.useContextmenu) {
+			e.preventDefault();
+			return;
+		}
+		if (self._contextmenus.length === 0) {
+			return;
+		}
+		var maxWidth = 0, items = [];
+		_each(self._contextmenus, function() {
+			if (this.title == '-') {
+				items.push(this);
+				return;
+			}
+			if (this.cond && this.cond()) {
+				items.push(this);
+				if (this.width && this.width > maxWidth) {
+					maxWidth = this.width;
+				}
+			}
+		});
+		while (items.length > 0 && items[0].title == '-') {
+			items.shift();
+		}
+		while (items.length > 0 && items[items.length - 1].title == '-') {
+			items.pop();
+		}
+		var prevItem = null;
+		_each(items, function(i) {
+			if (this.title == '-' && prevItem.title == '-') {
+				delete items[i];
+			}
+			prevItem = this;
+		});
+		if (items.length > 0) {
+			e.preventDefault();
+			var pos = K(self.edit.iframe).pos(),
+				menu = _menu({
+					x : pos.x + e.clientX,
+					y : pos.y + e.clientY,
+					width : maxWidth,
+					css : { visibility: 'hidden' },
+					shadowMode : self.shadowMode
+				});
+			_each(items, function() {
+				if (this.title) {
+					menu.addItem(this);
+				}
+			});
+			var docEl = _docElement(menu.doc),
+				menuHeight = menu.div.height();
+			if (e.clientY + menuHeight >= docEl.clientHeight - 100) {
+				menu.pos(menu.x, _removeUnit(menu.y) - menuHeight);
+			}
+			menu.div.css('visibility', 'visible');
+			self.menu = menu;
+		}
+	});
+}
+function _bindNewlineEvent() {
+	var self = this, doc = self.edit.doc, newlineTag = self.newlineTag;
+	if (_IE && newlineTag !== 'br') {
+		return;
+	}
+	if (_GECKO && _V < 3 && newlineTag !== 'p') {
+		return;
+	}
+	if (_OPERA && _V < 9) {
+		return;
+	}
+	var brSkipTagMap = _toMap('h1,h2,h3,h4,h5,h6,pre,li'),
+		pSkipTagMap = _toMap('p,h1,h2,h3,h4,h5,h6,pre,li,blockquote');
+	function getAncestorTagName(range) {
+		var ancestor = K(range.commonAncestor());
+		while (ancestor) {
+			if (ancestor.type == 1 && !ancestor.isStyle()) {
+				break;
+			}
+			ancestor = ancestor.parent();
+		}
+		return ancestor.name;
+	}
+	K(doc).keydown(function(e) {
+		if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) {
+			return;
+		}
+		self.cmd.selection();
+		var tagName = getAncestorTagName(self.cmd.range);
+		if (tagName == 'marquee' || tagName == 'select') {
+			return;
+		}
+		if (newlineTag === 'br' && !brSkipTagMap[tagName]) {
+			e.preventDefault();
+			self.insertHtml('<br />' + (_IE && _V < 9 ? '' : '\u200B'));
+			return;
+		}
+		if (!pSkipTagMap[tagName]) {
+			_nativeCommand(doc, 'formatblock', '<p>');
+		}
+	});
+	K(doc).keyup(function(e) {
+		if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) {
+			return;
+		}
+		if (newlineTag == 'br') {
+			return;
+		}
+		if (_GECKO) {
+			var root = self.cmd.commonAncestor('p');
+			var a = self.cmd.commonAncestor('a');
+			if (a && a.text() == '') {
+				a.remove(true);
+				self.cmd.range.selectNodeContents(root[0]).collapse(true);
+				self.cmd.select();
+			}
+			return;
+		}
+		self.cmd.selection();
+		var tagName = getAncestorTagName(self.cmd.range);
+		if (tagName == 'marquee' || tagName == 'select') {
+			return;
+		}
+		if (!pSkipTagMap[tagName]) {
+			_nativeCommand(doc, 'formatblock', '<p>');
+		}
+		var div = self.cmd.commonAncestor('div');
+		if (div) {
+			var p = K('<p></p>'),
+				child = div[0].firstChild;
+			while (child) {
+				var next = child.nextSibling;
+				p.append(child);
+				child = next;
+			}
+			div.before(p);
+			div.remove();
+			self.cmd.range.selectNodeContents(p[0]);
+			self.cmd.select();
+		}
+	});
+}
+function _bindTabEvent() {
+	var self = this, doc = self.edit.doc;
+	K(doc).keydown(function(e) {
+		if (e.which == 9) {
+			e.preventDefault();
+			if (self.afterTab) {
+				self.afterTab.call(self, e);
+				return;
+			}
+			var cmd = self.cmd, range = cmd.range;
+			range.shrink();
+			if (range.collapsed && range.startContainer.nodeType == 1) {
+				range.insertNode(K('@&nbsp;', doc)[0]);
+				cmd.select();
+			}
+			self.insertHtml('&nbsp;&nbsp;&nbsp;&nbsp;');
+		}
+	});
+}
+function _bindFocusEvent() {
+	var self = this;
+	K(self.edit.textarea[0], self.edit.win).focus(function(e) {
+		if (self.afterFocus) {
+			self.afterFocus.call(self, e);
+		}
+	}).blur(function(e) {
+		if (self.afterBlur) {
+			self.afterBlur.call(self, e);
+		}
+	});
+}
+function _removeBookmarkTag(html) {
+	return _trim(html.replace(/<span [^>]*id="?__kindeditor_bookmark_\w+_\d+__"?[^>]*><\/span>/ig, ''));
+}
+function _removeTempTag(html) {
+	return html.replace(/<div[^>]+class="?__kindeditor_paste__"?[^>]*>[\s\S]*?<\/div>/ig, '');
+}
+function _addBookmarkToStack(stack, bookmark) {
+	if (stack.length === 0) {
+		stack.push(bookmark);
+		return;
+	}
+	var prev = stack[stack.length - 1];
+	if (_removeBookmarkTag(bookmark.html) !== _removeBookmarkTag(prev.html)) {
+		stack.push(bookmark);
+	}
+}
+function _undoToRedo(fromStack, toStack) {
+	var self = this, edit = self.edit,
+		body = edit.doc.body,
+		range, bookmark;
+	if (fromStack.length === 0) {
+		return self;
+	}
+	if (edit.designMode) {
+		range = self.cmd.range;
+		bookmark = range.createBookmark(true);
+		bookmark.html = body.innerHTML;
+	} else {
+		bookmark = {
+			html : body.innerHTML
+		};
+	}
+	_addBookmarkToStack(toStack, bookmark);
+	var prev = fromStack.pop();
+	if (_removeBookmarkTag(bookmark.html) === _removeBookmarkTag(prev.html) && fromStack.length > 0) {
+		prev = fromStack.pop();
+	}
+	if (edit.designMode) {
+		edit.html(prev.html);
+		if (prev.start) {
+			range.moveToBookmark(prev);
+			self.select();
+		}
+	} else {
+		K(body).html(_removeBookmarkTag(prev.html));
+	}
+	return self;
+}
+function KEditor(options) {
+	var self = this;
+	self.options = {};
+	function setOption(key, val) {
+		if (KEditor.prototype[key] === undefined) {
+			self[key] = val;
+		}
+		self.options[key] = val;
+	}
+	_each(options, function(key, val) {
+		setOption(key, options[key]);
+	});
+	_each(K.options, function(key, val) {
+		if (self[key] === undefined) {
+			setOption(key, val);
+		}
+	});
+	var se = K(self.srcElement || '<textarea/>');
+	if (!self.width) {
+		self.width = se[0].style.width || se.width();
+	}
+	if (!self.height) {
+		self.height = se[0].style.height || se.height();
+	}
+	setOption('width', _undef(self.width, self.minWidth));
+	setOption('height', _undef(self.height, self.minHeight));
+	setOption('width', _addUnit(self.width));
+	setOption('height', _addUnit(self.height));
+	if (_MOBILE && (!_IOS || _V < 534)) {
+		self.designMode = false;
+	}
+	self.srcElement = se;
+	self.initContent = '';
+	self.plugin = {};
+	self.isCreated = false;
+	self._handlers = {};
+	self._contextmenus = [];
+	self._undoStack = [];
+	self._redoStack = [];
+	self._firstAddBookmark = true;
+	self.menu = self.contextmenu = null;
+	self.dialogs = [];
+}
+KEditor.prototype = {
+	lang : function(mixed) {
+		return _lang(mixed, this.langType);
+	},
+	loadPlugin : function(name, fn) {
+		var self = this;
+		if (_plugins[name]) {
+			if (!_isFunction(_plugins[name])) {
+				setTimeout(function() {
+					self.loadPlugin(name, fn);
+				}, 100);
+				return self;
+			}
+			_plugins[name].call(self, KindEditor);
+			if (fn) {
+				fn.call(self);
+			}
+			return self;
+		}
+		_plugins[name] = 'loading';
+		_loadScript(self.pluginsPath + name + '/' + name + '.js?ver=' + encodeURIComponent(K.DEBUG ? _TIME : _VERSION), function() {
+			setTimeout(function() {
+				if (_plugins[name]) {
+					self.loadPlugin(name, fn);
+				}
+			}, 0);
+		});
+		return self;
+	},
+	handler : function(key, fn) {
+		var self = this;
+		if (!self._handlers[key]) {
+			self._handlers[key] = [];
+		}
+		if (_isFunction(fn)) {
+			self._handlers[key].push(fn);
+			return self;
+		}
+		_each(self._handlers[key], function() {
+			fn = this.call(self, fn);
+		});
+		return fn;
+	},
+	clickToolbar : function(name, fn) {
+		var self = this, key = 'clickToolbar' + name;
+		if (fn === undefined) {
+			if (self._handlers[key]) {
+				return self.handler(key);
+			}
+			self.loadPlugin(name, function() {
+				self.handler(key);
+			});
+			return self;
+		}
+		return self.handler(key, fn);
+	},
+	updateState : function() {
+		var self = this;
+		_each(('justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,' +
+			'subscript,superscript,bold,italic,underline,strikethrough').split(','), function(i, name) {
+			self.cmd.state(name) ? self.toolbar.select(name) : self.toolbar.unselect(name);
+		});
+		return self;
+	},
+	addContextmenu : function(item) {
+		this._contextmenus.push(item);
+		return this;
+	},
+	afterCreate : function(fn) {
+		return this.handler('afterCreate', fn);
+	},
+	beforeRemove : function(fn) {
+		return this.handler('beforeRemove', fn);
+	},
+	beforeGetHtml : function(fn) {
+		return this.handler('beforeGetHtml', fn);
+	},
+	beforeSetHtml : function(fn) {
+		return this.handler('beforeSetHtml', fn);
+	},
+	afterSetHtml : function(fn) {
+		return this.handler('afterSetHtml', fn);
+	},
+	create : function() {
+		var self = this, fullscreenMode = self.fullscreenMode;
+		if (self.isCreated) {
+			return self;
+		}
+		if (self.srcElement.data('kindeditor')) {
+			return self;
+		}
+		self.srcElement.data('kindeditor', 'true');
+		if (fullscreenMode) {
+			_docElement().style.overflow = 'hidden';
+		} else {
+			_docElement().style.overflow = '';
+		}
+		var width = fullscreenMode ? _docElement().clientWidth + 'px' : self.width,
+			height = fullscreenMode ? _docElement().clientHeight + 'px' : self.height;
+		if ((_IE && _V < 8) || _QUIRKS) {
+			height = _addUnit(_removeUnit(height) + 2);
+		}
+		var container = self.container = K(self.layout);
+		if (fullscreenMode) {
+			K(document.body).append(container);
+		} else {
+			self.srcElement.before(container);
+		}
+		var toolbarDiv = K('.toolbar', container),
+			editDiv = K('.edit', container),
+			statusbar = self.statusbar = K('.statusbar', container);
+		container.removeClass('container')
+			.addClass('ke-container ke-container-' + self.themeType).css('width', width);
+		if (fullscreenMode) {
+			container.css({
+				position : 'absolute',
+				left : 0,
+				top : 0,
+				'z-index' : 811211
+			});
+			if (!_GECKO) {
+				self._scrollPos = _getScrollPos();
+			}
+			window.scrollTo(0, 0);
+			K(document.body).css({
+				'height' : '1px',
+				'overflow' : 'hidden'
+			});
+			K(document.body.parentNode).css('overflow', 'hidden');
+			self._fullscreenExecuted = true;
+		} else {
+			if (self._fullscreenExecuted) {
+				K(document.body).css({
+					'height' : '',
+					'overflow' : ''
+				});
+				K(document.body.parentNode).css('overflow', '');
+			}
+			if (self._scrollPos) {
+				window.scrollTo(self._scrollPos.x, self._scrollPos.y);
+			}
+		}
+		var htmlList = [];
+		K.each(self.items, function(i, name) {
+			if (name == '|') {
+				htmlList.push('<span class="ke-inline-block ke-separator"></span>');
+			} else if (name == '/') {
+				htmlList.push('<div class="ke-hr"></div>');
+			} else {
+				htmlList.push('<span class="ke-outline" data-name="' + name + '" title="' + self.lang(name) + '" unselectable="on">');
+				htmlList.push('<span class="ke-toolbar-icon ke-toolbar-icon-url ke-icon-' + name + '" unselectable="on"></span></span>');
+			}
+		});
+		var toolbar = self.toolbar = _toolbar({
+			src : toolbarDiv,
+			html : htmlList.join(''),
+			noDisableItems : self.noDisableItems,
+			click : function(e, name) {
+				e.stop();
+				if (self.menu) {
+					var menuName = self.menu.name;
+					self.hideMenu();
+					if (menuName === name) {
+						return;
+					}
+				}
+				self.clickToolbar(name);
+			}
+		});
+		var editHeight = _removeUnit(height) - toolbar.div.height();
+		var edit = self.edit = _edit({
+			height : editHeight > 0 && _removeUnit(height) > self.minHeight ? editHeight : self.minHeight,
+			src : editDiv,
+			srcElement : self.srcElement,
+			designMode : self.designMode,
+			themesPath : self.themesPath,
+			bodyClass : self.bodyClass,
+			cssPath : self.cssPath,
+			cssData : self.cssData,
+			beforeGetHtml : function(html) {
+				html = self.beforeGetHtml(html);
+				html = _removeBookmarkTag(_removeTempTag(html));
+				return _formatHtml(html, self.filterMode ? self.htmlTags : null, self.urlType, self.wellFormatMode, self.indentChar);
+			},
+			beforeSetHtml : function(html) {
+				html = _formatHtml(html, self.filterMode ? self.htmlTags : null, '', false);
+				return self.beforeSetHtml(html);
+			},
+			afterSetHtml : function() {
+				self.edit = edit = this;
+				self.afterSetHtml();
+			},
+			afterCreate : function() {
+				self.edit = edit = this;
+				self.cmd = edit.cmd;
+				self._docMousedownFn = function(e) {
+					if (self.menu) {
+						self.hideMenu();
+					}
+				};
+				K(edit.doc, document).mousedown(self._docMousedownFn);
+				_bindContextmenuEvent.call(self);
+				_bindNewlineEvent.call(self);
+				_bindTabEvent.call(self);
+				_bindFocusEvent.call(self);
+				edit.afterChange(function(e) {
+					if (!edit.designMode) {
+						return;
+					}
+					self.updateState();
+					self.addBookmark();
+					if (self.options.afterChange) {
+						self.options.afterChange.call(self);
+					}
+				});
+				edit.textarea.keyup(function(e) {
+					if (!e.ctrlKey && !e.altKey && _INPUT_KEY_MAP[e.which]) {
+						if (self.options.afterChange) {
+							self.options.afterChange.call(self);
+						}
+					}
+				});
+				if (self.readonlyMode) {
+					self.readonly();
+				}
+				self.isCreated = true;
+				if (self.initContent === '') {
+					self.initContent = self.html();
+				}
+				if (self._undoStack.length > 0) {
+					var prev = self._undoStack.pop();
+					if (prev.start) {
+						self.html(prev.html);
+						edit.cmd.range.moveToBookmark(prev);
+						self.select();
+					}
+				}
+				self.afterCreate();
+				if (self.options.afterCreate) {
+					self.options.afterCreate.call(self);
+				}
+			}
+		});
+		statusbar.removeClass('statusbar').addClass('ke-statusbar')
+			.append('<span class="ke-inline-block ke-statusbar-center-icon"></span>')
+			.append('<span class="ke-inline-block ke-statusbar-right-icon"></span>');
+		if (self._fullscreenResizeHandler) {
+			K(window).unbind('resize', self._fullscreenResizeHandler);
+			self._fullscreenResizeHandler = null;
+		}
+		function initResize() {
+			if (statusbar.height() === 0) {
+				setTimeout(initResize, 100);
+				return;
+			}
+			self.resize(width, height, false);
+		}
+		initResize();
+		if (fullscreenMode) {
+			self._fullscreenResizeHandler = function(e) {
+				if (self.isCreated) {
+					self.resize(_docElement().clientWidth, _docElement().clientHeight, false);
+				}
+			};
+			K(window).bind('resize', self._fullscreenResizeHandler);
+			toolbar.select('fullscreen');
+			statusbar.first().css('visibility', 'hidden');
+			statusbar.last().css('visibility', 'hidden');
+		} else {
+			if (_GECKO) {
+				K(window).bind('scroll', function(e) {
+					self._scrollPos = _getScrollPos();
+				});
+			}
+			if (self.resizeType > 0) {
+				_drag({
+					moveEl : container,
+					clickEl : statusbar,
+					moveFn : function(x, y, width, height, diffX, diffY) {
+						height += diffY;
+						self.resize(null, height);
+					}
+				});
+			} else {
+				statusbar.first().css('visibility', 'hidden');
+			}
+			if (self.resizeType === 2) {
+				_drag({
+					moveEl : container,
+					clickEl : statusbar.last(),
+					moveFn : function(x, y, width, height, diffX, diffY) {
+						width += diffX;
+						height += diffY;
+						self.resize(width, height);
+					}
+				});
+			} else {
+				statusbar.last().css('visibility', 'hidden');
+			}
+		}
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (!self.isCreated) {
+			return self;
+		}
+		self.beforeRemove();
+		self.srcElement.data('kindeditor', '');
+		if (self.menu) {
+			self.hideMenu();
+		}
+		_each(self.dialogs, function() {
+			self.hideDialog();
+		});
+		K(document).unbind('mousedown', self._docMousedownFn);
+		self.toolbar.remove();
+		self.edit.remove();
+		self.statusbar.last().unbind();
+		self.statusbar.unbind();
+		self.container.remove();
+		self.container = self.toolbar = self.edit = self.menu = null;
+		self.dialogs = [];
+		self.isCreated = false;
+		return self;
+	},
+	resize : function(width, height, updateProp) {
+		var self = this;
+		updateProp = _undef(updateProp, true);
+		if (width) {
+			if (!/%/.test(width)) {
+				width = _removeUnit(width);
+				width = width < self.minWidth ? self.minWidth : width;
+			}
+			self.container.css('width', _addUnit(width));
+			if (updateProp) {
+				self.width = _addUnit(width);
+			}
+		}
+		if (height) {
+			height = _removeUnit(height);
+			editHeight = _removeUnit(height) - self.toolbar.div.height() - self.statusbar.height();
+			editHeight = editHeight < self.minHeight ? self.minHeight : editHeight;
+			self.edit.setHeight(editHeight);
+			if (updateProp) {
+				self.height = _addUnit(height);
+			}
+		}
+		return self;
+	},
+	select : function() {
+		this.isCreated && this.cmd.select();
+		return this;
+	},
+	html : function(val) {
+		var self = this;
+		if (val === undefined) {
+			return self.isCreated ? self.edit.html() : _elementVal(self.srcElement);
+		}
+		self.isCreated ? self.edit.html(val) : _elementVal(self.srcElement, val);
+		if (self.isCreated) {
+			self.cmd.selection();
+		}
+		return self;
+	},
+	fullHtml : function() {
+		return this.isCreated ? this.edit.html(undefined, true) : '';
+	},
+	text : function(val) {
+		var self = this;
+		if (val === undefined) {
+			return _trim(self.html().replace(/<(?!img|embed).*?>/ig, '').replace(/&nbsp;/ig, ' '));
+		} else {
+			return self.html(_escape(val));
+		}
+	},
+	isEmpty : function() {
+		return _trim(this.text().replace(/\r\n|\n|\r/, '')) === '';
+	},
+	isDirty : function() {
+		return _trim(this.initContent.replace(/\r\n|\n|\r|t/g, '')) !== _trim(this.html().replace(/\r\n|\n|\r|t/g, ''));
+	},
+	selectedHtml : function() {
+		var val = this.isCreated ? this.cmd.range.html() : '';
+		val = _removeBookmarkTag(_removeTempTag(val));
+		return val;
+	},
+	count : function(mode) {
+		var self = this;
+		mode = (mode || 'html').toLowerCase();
+		if (mode === 'html') {
+			return self.html().length;
+		}
+		if (mode === 'text') {
+			return self.text().replace(/<(?:img|embed).*?>/ig, 'K').replace(/\r\n|\n|\r/g, '').length;
+		}
+		return 0;
+	},
+	exec : function(key) {
+		key = key.toLowerCase();
+		var self = this, cmd = self.cmd,
+			changeFlag = _inArray(key, 'selectall,copy,paste,print'.split(',')) < 0;
+		if (changeFlag) {
+			self.addBookmark(false);
+		}
+		cmd[key].apply(cmd, _toArray(arguments, 1));
+		if (changeFlag) {
+			self.updateState();
+			self.addBookmark(false);
+			if (self.options.afterChange) {
+				self.options.afterChange.call(self);
+			}
+		}
+		return self;
+	},
+	insertHtml : function(val, quickMode) {
+		if (!this.isCreated) {
+			return this;
+		}
+		val = this.beforeSetHtml(val);
+		this.exec('inserthtml', val, quickMode);
+		return this;
+	},
+	appendHtml : function(val) {
+		this.html(this.html() + val);
+		if (this.isCreated) {
+			var cmd = this.cmd;
+			cmd.range.selectNodeContents(cmd.doc.body).collapse(false);
+			cmd.select();
+		}
+		return this;
+	},
+	sync : function() {
+		_elementVal(this.srcElement, this.html());
+		return this;
+	},
+	focus : function() {
+		this.isCreated ? this.edit.focus() : this.srcElement[0].focus();
+		return this;
+	},
+	blur : function() {
+		this.isCreated ? this.edit.blur() : this.srcElement[0].blur();
+		return this;
+	},
+	addBookmark : function(checkSize) {
+		checkSize = _undef(checkSize, true);
+		var self = this, edit = self.edit,
+			body = edit.doc.body,
+			html = _removeTempTag(body.innerHTML), bookmark;
+		if (checkSize && self._undoStack.length > 0) {
+			var prev = self._undoStack[self._undoStack.length - 1];
+			if (Math.abs(html.length - _removeBookmarkTag(prev.html).length) < self.minChangeSize) {
+				return self;
+			}
+		}
+		if (edit.designMode && !self._firstAddBookmark) {
+			var range = self.cmd.range;
+			bookmark = range.createBookmark(true);
+			bookmark.html = _removeTempTag(body.innerHTML);
+			range.moveToBookmark(bookmark);
+		} else {
+			bookmark = {
+				html : html
+			};
+		}
+		self._firstAddBookmark = false;
+		_addBookmarkToStack(self._undoStack, bookmark);
+		return self;
+	},
+	undo : function() {
+		return _undoToRedo.call(this, this._undoStack, this._redoStack);
+	},
+	redo : function() {
+		return _undoToRedo.call(this, this._redoStack, this._undoStack);
+	},
+	fullscreen : function(bool) {
+		this.fullscreenMode = (bool === undefined ? !this.fullscreenMode : bool);
+		this.addBookmark(false);
+		return this.remove().create();
+	},
+	readonly : function(isReadonly) {
+		isReadonly = _undef(isReadonly, true);
+		var self = this, edit = self.edit, doc = edit.doc;
+		if (self.designMode) {
+			self.toolbar.disableAll(isReadonly, []);
+		} else {
+			_each(self.noDisableItems, function() {
+				self.toolbar[isReadonly ? 'disable' : 'enable'](this);
+			});
+		}
+		if (_IE) {
+			doc.body.contentEditable = !isReadonly;
+		} else {
+			doc.designMode = isReadonly ? 'off' : 'on';
+		}
+		edit.textarea[0].disabled = isReadonly;
+	},
+	createMenu : function(options) {
+		var self = this,
+			name = options.name,
+			knode = self.toolbar.get(name),
+			pos = knode.pos();
+		options.x = pos.x;
+		options.y = pos.y + knode.height();
+		options.z = self.options.zIndex;
+		options.shadowMode = _undef(options.shadowMode, self.shadowMode);
+		if (options.selectedColor !== undefined) {
+			options.cls = 'ke-colorpicker-' + self.themeType;
+			options.noColor = self.lang('noColor');
+			self.menu = _colorpicker(options);
+		} else {
+			options.cls = 'ke-menu-' + self.themeType;
+			options.centerLineMode = false;
+			self.menu = _menu(options);
+		}
+		return self.menu;
+	},
+	hideMenu : function() {
+		this.menu.remove();
+		this.menu = null;
+		return this;
+	},
+	hideContextmenu : function() {
+		this.contextmenu.remove();
+		this.contextmenu = null;
+		return this;
+	},
+	createDialog : function(options) {
+		var self = this, name = options.name;
+		options.z = self.options.zIndex;
+		options.shadowMode = _undef(options.shadowMode, self.shadowMode);
+		options.closeBtn = _undef(options.closeBtn, {
+			name : self.lang('close'),
+			click : function(e) {
+				self.hideDialog();
+				if (_IE && self.cmd) {
+					self.cmd.select();
+				}
+			}
+		});
+		options.noBtn = _undef(options.noBtn, {
+			name : self.lang(options.yesBtn ? 'no' : 'close'),
+			click : function(e) {
+				self.hideDialog();
+				if (_IE && self.cmd) {
+					self.cmd.select();
+				}
+			}
+		});
+		if (self.dialogAlignType != 'page') {
+			options.alignEl = self.container;
+		}
+		options.cls = 'ke-dialog-' + self.themeType;
+		if (self.dialogs.length > 0) {
+			var firstDialog = self.dialogs[0],
+				parentDialog = self.dialogs[self.dialogs.length - 1];
+			firstDialog.setMaskIndex(parentDialog.z + 2);
+			options.z = parentDialog.z + 3;
+			options.showMask = false;
+		}
+		var dialog = _dialog(options);
+		self.dialogs.push(dialog);
+		return dialog;
+	},
+	hideDialog : function() {
+		var self = this;
+		if (self.dialogs.length > 0) {
+			self.dialogs.pop().remove();
+		}
+		if (self.dialogs.length > 0) {
+			var firstDialog = self.dialogs[0],
+				parentDialog = self.dialogs[self.dialogs.length - 1];
+			firstDialog.setMaskIndex(parentDialog.z - 1);
+		}
+		return self;
+	},
+	errorDialog : function(html) {
+		var self = this;
+		var dialog = self.createDialog({
+			width : 750,
+			title : self.lang('uploadError'),
+			body : '<div style="padding:10px 20px;"><iframe frameborder="0" style="width:708px;height:400px;"></iframe></div>'
+		});
+		var iframe = K('iframe', dialog.div), doc = K.iframeDoc(iframe);
+		doc.open();
+		doc.write(html);
+		doc.close();
+		K(doc.body).css('background-color', '#FFF');
+		iframe[0].contentWindow.focus();
+		return self;
+	}
+};
+function _editor(options) {
+	return new KEditor(options);
+}
+_instances = [];
+function _create(expr, options) {
+	options = options || {};
+	options.basePath = _undef(options.basePath, K.basePath);
+	options.themesPath = _undef(options.themesPath, options.basePath + 'themes/');
+	options.langPath = _undef(options.langPath, options.basePath + 'lang/');
+	options.pluginsPath = _undef(options.pluginsPath, options.basePath + 'plugins/');
+	if (_undef(options.loadStyleMode, K.options.loadStyleMode)) {
+		var themeType = _undef(options.themeType, K.options.themeType);
+		_loadStyle(options.themesPath + 'default/default.css');
+		_loadStyle(options.themesPath + themeType + '/' + themeType + '.css');
+	}
+	function create(editor) {
+		_each(_plugins, function(name, fn) {
+			if (_isFunction(fn)) {
+				fn.call(editor, KindEditor);
+			}
+		});
+		return editor.create();
+	}
+	var knode = K(expr);
+	if (!knode || knode.length === 0) {
+		return;
+	}
+	if (knode.length > 1) {
+		knode.each(function() {
+			_create(this, options);
+		});
+		return _instances[0];
+	}
+	options.srcElement = knode[0];
+	var editor = new KEditor(options);
+	_instances.push(editor);
+	if (_language[editor.langType]) {
+		return create(editor);
+	}
+	_loadScript(editor.langPath + editor.langType + '.js?ver=' + encodeURIComponent(K.DEBUG ? _TIME : _VERSION), function() {
+		create(editor);
+	});
+	return editor;
+}
+function _eachEditor(expr, fn) {
+	K(expr).each(function(i, el) {
+		K.each(_instances, function(j, editor) {
+			if (editor && editor.srcElement[0] == el) {
+				fn.call(editor, j);
+				return false;
+			}
+		});
+	});
+}
+K.remove = function(expr) {
+	_eachEditor(expr, function(i) {
+		this.remove();
+		_instances.splice(i, 1);
+	});
+};
+K.sync = function(expr) {
+	_eachEditor(expr, function() {
+		this.sync();
+	});
+};
+K.html = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.html(val);
+	});
+};
+K.insertHtml = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.insertHtml(val);
+	});
+};
+K.appendHtml = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.appendHtml(val);
+	});
+};
+if (_IE && _V < 7) {
+	_nativeCommand(document, 'BackgroundImageCache', true);
+}
+K.EditorClass = KEditor;
+K.editor = _editor;
+K.create = _create;
+K.instances = _instances;
+K.plugin = _plugin;
+K.lang = _lang;
+_plugin('core', function(K) {
+	var self = this,
+		shortcutKeys = {
+			undo : 'Z', redo : 'Y', bold : 'B', italic : 'I', underline : 'U', print : 'P', selectall : 'A'
+		};
+	self.afterSetHtml(function() {
+		if (self.options.afterChange) {
+			self.options.afterChange.call(self);
+		}
+	});
+	self.afterCreate(function() {
+		if (self.syncType != 'form') {
+			return;
+		}
+		var el = K(self.srcElement), hasForm = false;
+		while ((el = el.parent())) {
+			if (el.name == 'form') {
+				hasForm = true;
+				break;
+			}
+		}
+		if (hasForm) {
+			el.bind('submit', function(e) {
+				self.sync();
+				K(window).bind('unload', function() {
+					self.edit.textarea.remove();
+				});
+			});
+			var resetBtn = K('[type="reset"]', el);
+			resetBtn.click(function() {
+				self.html(self.initContent);
+				self.cmd.selection();
+			});
+			self.beforeRemove(function() {
+				el.unbind();
+				resetBtn.unbind();
+			});
+		}
+	});
+	self.clickToolbar('source', function() {
+		if (self.edit.designMode) {
+			self.toolbar.disableAll(true);
+			self.edit.design(false);
+			self.toolbar.select('source');
+		} else {
+			self.toolbar.disableAll(false);
+			self.edit.design(true);
+			self.toolbar.unselect('source');
+			if (_GECKO) {
+				setTimeout(function() {
+					self.cmd.selection();
+				}, 0);
+			} else {
+				self.cmd.selection();
+			}
+		}
+		self.designMode = self.edit.designMode;
+	});
+	self.afterCreate(function() {
+		if (!self.designMode) {
+			self.toolbar.disableAll(true).select('source');
+		}
+	});
+	self.clickToolbar('fullscreen', function() {
+		self.fullscreen();
+	});
+	if (self.fullscreenShortcut) {
+		var loaded = false;
+		self.afterCreate(function() {
+			K(self.edit.doc, self.edit.textarea).keyup(function(e) {
+				if (e.which == 27) {
+					setTimeout(function() {
+						self.fullscreen();
+					}, 0);
+				}
+			});
+			if (loaded) {
+				if (_IE && !self.designMode) {
+					return;
+				}
+				self.focus();
+			}
+			if (!loaded) {
+				loaded = true;
+			}
+		});
+	}
+	_each('undo,redo'.split(','), function(i, name) {
+		if (shortcutKeys[name]) {
+			self.afterCreate(function() {
+				_ctrl(this.edit.doc, shortcutKeys[name], function() {
+					self.clickToolbar(name);
+				});
+			});
+		}
+		self.clickToolbar(name, function() {
+			self[name]();
+		});
+	});
+	self.clickToolbar('formatblock', function() {
+		var blocks = self.lang('formatblock.formatBlock'),
+			heights = {
+				h1 : 28,
+				h2 : 24,
+				h3 : 18,
+				H4 : 14,
+				p : 12
+			},
+			curVal = self.cmd.val('formatblock'),
+			menu = self.createMenu({
+				name : 'formatblock',
+				width : self.langType == 'en' ? 200 : 150
+			});
+		_each(blocks, function(key, val) {
+			var style = 'font-size:' + heights[key] + 'px;';
+			if (key.charAt(0) === 'h') {
+				style += 'font-weight:bold;';
+			}
+			menu.addItem({
+				title : '<span style="' + style + '" unselectable="on">' + val + '</span>',
+				height : heights[key] + 12,
+				checked : (curVal === key || curVal === val),
+				click : function() {
+					self.select().exec('formatblock', '<' + key + '>').hideMenu();
+				}
+			});
+		});
+	});
+	self.clickToolbar('fontname', function() {
+		var curVal = self.cmd.val('fontname'),
+			menu = self.createMenu({
+				name : 'fontname',
+				width : 150
+			});
+		_each(self.lang('fontname.fontName'), function(key, val) {
+			menu.addItem({
+				title : '<span style="font-family: ' + key + ';" unselectable="on">' + val + '</span>',
+				checked : (curVal === key.toLowerCase() || curVal === val.toLowerCase()),
+				click : function() {
+					self.exec('fontname', key).hideMenu();
+				}
+			});
+		});
+	});
+	self.clickToolbar('fontsize', function() {
+		var curVal = self.cmd.val('fontsize'),
+			menu = self.createMenu({
+				name : 'fontsize',
+				width : 150
+			});
+		_each(self.fontSizeTable, function(i, val) {
+			menu.addItem({
+				title : '<span style="font-size:' + val + ';" unselectable="on">' + val + '</span>',
+				height : _removeUnit(val) + 12,
+				checked : curVal === val,
+				click : function() {
+					self.exec('fontsize', val).hideMenu();
+				}
+			});
+		});
+	});
+	_each('forecolor,hilitecolor'.split(','), function(i, name) {
+		self.clickToolbar(name, function() {
+			self.createMenu({
+				name : name,
+				selectedColor : self.cmd.val(name) || 'default',
+				colors : self.colorTable,
+				click : function(color) {
+					self.exec(name, color).hideMenu();
+				}
+			});
+		});
+	});
+	_each(('cut,copy,paste').split(','), function(i, name) {
+		self.clickToolbar(name, function() {
+			self.focus();
+			try {
+				self.exec(name, null);
+			} catch(e) {
+				alert(self.lang(name + 'Error'));
+			}
+		});
+	});
+	self.clickToolbar('about', function() {
+		var html = '<div style="margin:20px;">' +
+			'<div>KindEditor ' + _VERSION + '</div>' +
+			'<div>Copyright &copy; <a href="http://www.kindsoft.net/" target="_blank">kindsoft.net</a> All rights reserved.</div>' +
+			'</div>';
+		self.createDialog({
+			name : 'about',
+			width : 350,
+			title : self.lang('about'),
+			body : html
+		});
+	});
+	self.plugin.getSelectedLink = function() {
+		return self.cmd.commonAncestor('a');
+	};
+	self.plugin.getSelectedImage = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return !/^ke-\w+$/i.test(img[0].className);
+		});
+	};
+	self.plugin.getSelectedFlash = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-flash';
+		});
+	};
+	self.plugin.getSelectedMedia = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-media' || img[0].className == 'ke-rm';
+		});
+	};
+	self.plugin.getSelectedAnchor = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-anchor';
+		});
+	};
+	_each('link,image,flash,media,anchor'.split(','), function(i, name) {
+		var uName = name.charAt(0).toUpperCase() + name.substr(1);
+		_each('edit,delete'.split(','), function(j, val) {
+			self.addContextmenu({
+				title : self.lang(val + uName),
+				click : function() {
+					self.loadPlugin(name, function() {
+						self.plugin[name][val]();
+						self.hideMenu();
+					});
+				},
+				cond : self.plugin['getSelected' + uName],
+				width : 150,
+				iconClass : val == 'edit' ? 'ke-icon-' + name : undefined
+			});
+		});
+		self.addContextmenu({ title : '-' });
+	});
+	self.plugin.getSelectedTable = function() {
+		return self.cmd.commonAncestor('table');
+	};
+	self.plugin.getSelectedRow = function() {
+		return self.cmd.commonAncestor('tr');
+	};
+	self.plugin.getSelectedCell = function() {
+		return self.cmd.commonAncestor('td');
+	};
+	_each(('prop,cellprop,colinsertleft,colinsertright,rowinsertabove,rowinsertbelow,rowmerge,colmerge,' +
+	'rowsplit,colsplit,coldelete,rowdelete,insert,delete').split(','), function(i, val) {
+		var cond = _inArray(val, ['prop', 'delete']) < 0 ? self.plugin.getSelectedCell : self.plugin.getSelectedTable;
+		self.addContextmenu({
+			title : self.lang('table' + val),
+			click : function() {
+				self.loadPlugin('table', function() {
+					self.plugin.table[val]();
+					self.hideMenu();
+				});
+			},
+			cond : cond,
+			width : 170,
+			iconClass : 'ke-icon-table' + val
+		});
+	});
+	self.addContextmenu({ title : '-' });
+	_each(('selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,' +
+		'insertunorderedlist,indent,outdent,subscript,superscript,hr,print,' +
+		'bold,italic,underline,strikethrough,removeformat,unlink').split(','), function(i, name) {
+		if (shortcutKeys[name]) {
+			self.afterCreate(function() {
+				_ctrl(this.edit.doc, shortcutKeys[name], function() {
+					self.cmd.selection();
+					self.clickToolbar(name);
+				});
+			});
+		}
+		self.clickToolbar(name, function() {
+			self.focus().exec(name, null);
+		});
+	});
+	self.afterCreate(function() {
+		var doc = self.edit.doc, cmd, bookmark, div,
+			cls = '__kindeditor_paste__', pasting = false;
+		function movePastedData() {
+			cmd.range.moveToBookmark(bookmark);
+			cmd.select();
+			if (_WEBKIT) {
+				K('div.' + cls, div).each(function() {
+					K(this).after('<br />').remove(true);
+				});
+				K('span.Apple-style-span', div).remove(true);
+				K('span.Apple-tab-span', div).remove(true);
+				K('span[style]', div).each(function() {
+					if (K(this).css('white-space') == 'nowrap') {
+						K(this).remove(true);
+					}
+				});
+				K('meta', div).remove();
+			}
+			var html = div[0].innerHTML;
+			div.remove();
+			if (html === '') {
+				return;
+			}
+			if (_WEBKIT) {
+				html = html.replace(/(<br>)\1/ig, '$1');
+			}
+			if (self.pasteType === 2) {
+				html = html.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig, '');
+				if (/schemas-microsoft-com|worddocument|mso-\w+/i.test(html)) {
+					html = _clearMsWord(html, self.filterMode ? self.htmlTags : K.options.htmlTags);
+				} else {
+					html = _formatHtml(html, self.filterMode ? self.htmlTags : null);
+					html = self.beforeSetHtml(html);
+				}
+			}
+			if (self.pasteType === 1) {
+				html = html.replace(/&nbsp;/ig, ' ');
+				html = html.replace(/\n\s*\n/g, '\n');
+				html = html.replace(/<br[^>]*>/ig, '\n');
+				html = html.replace(/<\/p><p[^>]*>/ig, '\n');
+				html = html.replace(/<[^>]+>/g, '');
+				html = html.replace(/ {2}/g, ' &nbsp;');
+				if (self.newlineTag == 'p') {
+					if (/\n/.test(html)) {
+						html = html.replace(/^/, '<p>').replace(/$/, '<br /></p>').replace(/\n/g, '<br /></p><p>');
+					}
+				} else {
+					html = html.replace(/\n/g, '<br />$&');
+				}
+			}
+			self.insertHtml(html, true);
+		}
+		K(doc.body).bind('paste', function(e){
+			if (self.pasteType === 0) {
+				e.stop();
+				return;
+			}
+			if (pasting) {
+				return;
+			}
+			pasting = true;
+			K('div.' + cls, doc).remove();
+			cmd = self.cmd.selection();
+			bookmark = cmd.range.createBookmark();
+			div = K('<div class="' + cls + '"></div>', doc).css({
+				position : 'absolute',
+				width : '1px',
+				height : '1px',
+				overflow : 'hidden',
+				left : '-1981px',
+				top : K(bookmark.start).pos().y + 'px',
+				'white-space' : 'nowrap'
+			});
+			K(doc.body).append(div);
+			if (_IE) {
+				var rng = cmd.range.get(true);
+				rng.moveToElementText(div[0]);
+				rng.select();
+				rng.execCommand('paste');
+				e.preventDefault();
+			} else {
+				cmd.range.selectNodeContents(div[0]);
+				cmd.select();
+			}
+			setTimeout(function() {
+				movePastedData();
+				pasting = false;
+			}, 0);
+		});
+	});
+	self.beforeGetHtml(function(html) {
+		if (_IE && _V <= 8) {
+			html = html.replace(/<div\s+[^>]*data-ke-input-tag="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, tag) {
+				return unescape(tag);
+			});
+			html = html.replace(/(<input)((?:\s+[^>]*)?>)/ig, function($0, $1, $2) {
+				if (!/\s+type="[^"]+"/i.test($0)) {
+					return $1 + ' type="text"' + $2;
+				}
+				return $0;
+			});
+		}
+		return html.replace(/(<(?:noscript|noscript\s[^>]*)>)([\s\S]*?)(<\/noscript>)/ig, function($0, $1, $2, $3) {
+			return $1 + _unescape($2).replace(/\s+/g, ' ') + $3;
+		})
+		.replace(/<img[^>]*class="?ke-(flash|rm|media)"?[^>]*>/ig, function(full) {
+			var imgAttrs = _getAttrList(full);
+			var styles = _getCssList(imgAttrs.style || '');
+			var attrs = _mediaAttrs(imgAttrs['data-ke-tag']);
+			var width = _undef(styles.width, '');
+			var height = _undef(styles.height, '');
+			if (/px/i.test(width)) {
+				width = _removeUnit(width);
+			}
+			if (/px/i.test(height)) {
+				height = _removeUnit(height);
+			}
+			attrs.width = _undef(imgAttrs.width, width);
+			attrs.height = _undef(imgAttrs.height, height);
+			return _mediaEmbed(attrs);
+		})
+		.replace(/<img[^>]*class="?ke-anchor"?[^>]*>/ig, function(full) {
+			var imgAttrs = _getAttrList(full);
+			return '<a name="' + unescape(imgAttrs['data-ke-name']) + '"></a>';
+		})
+		.replace(/<div\s+[^>]*data-ke-script-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, attr, code) {
+			return '<script' + unescape(attr) + '>' + unescape(code) + '</script>';
+		})
+		.replace(/<div\s+[^>]*data-ke-noscript-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, attr, code) {
+			return '<noscript' + unescape(attr) + '>' + unescape(code) + '</noscript>';
+		})
+		.replace(/(<[^>]*)data-ke-src="([^"]*)"([^>]*>)/ig, function(full, start, src, end) {
+			full = full.replace(/(\s+(?:href|src)=")[^"]*(")/i, function($0, $1, $2) {
+				return $1 + _unescape(src) + $2;
+			});
+			full = full.replace(/\s+data-ke-src="[^"]*"/i, '');
+			return full;
+		})
+		.replace(/(<[^>]+\s)data-ke-(on\w+="[^"]*"[^>]*>)/ig, function(full, start, end) {
+			return start + end;
+		});
+	});
+	self.beforeSetHtml(function(html) {
+		if (_IE && _V <= 8) {
+			html = html.replace(/<input[^>]*>|<(select|button)[^>]*>[\s\S]*?<\/\1>/ig, function(full) {
+				var attrs = _getAttrList(full);
+				var styles = _getCssList(attrs.style || '');
+				if (styles.display == 'none') {
+					return '<div class="ke-display-none" data-ke-input-tag="' + escape(full) + '"></div>';
+				}
+				return full;
+			});
+		}
+		return html.replace(/<embed[^>]*type="([^"]+)"[^>]*>(?:<\/embed>)?/ig, function(full) {
+			var attrs = _getAttrList(full);
+			attrs.src = _undef(attrs.src, '');
+			attrs.width = _undef(attrs.width, 0);
+			attrs.height = _undef(attrs.height, 0);
+			return _mediaImg(self.themesPath + 'common/blank.gif', attrs);
+		})
+		.replace(/<a[^>]*name="([^"]+)"[^>]*>(?:<\/a>)?/ig, function(full) {
+			var attrs = _getAttrList(full);
+			if (attrs.href !== undefined) {
+				return full;
+			}
+			return '<img class="ke-anchor" src="' + self.themesPath + 'common/anchor.gif" data-ke-name="' + escape(attrs.name) + '" />';
+		})
+		.replace(/<script([^>]*)>([\s\S]*?)<\/script>/ig, function(full, attr, code) {
+			return '<div class="ke-script" data-ke-script-attr="' + escape(attr) + '">' + escape(code) + '</div>';
+		})
+		.replace(/<noscript([^>]*)>([\s\S]*?)<\/noscript>/ig, function(full, attr, code) {
+			return '<div class="ke-noscript" data-ke-noscript-attr="' + escape(attr) + '">' + escape(code) + '</div>';
+		})
+		.replace(/(<[^>]*)(href|src)="([^"]*)"([^>]*>)/ig, function(full, start, key, src, end) {
+			if (full.match(/\sdata-ke-src="[^"]*"/i)) {
+				return full;
+			}
+			full = start + key + '="' + src + '"' + ' data-ke-src="' + _escape(src) + '"' + end;
+			return full;
+		})
+		.replace(/(<[^>]+\s)(on\w+="[^"]*"[^>]*>)/ig, function(full, start, end) {
+			return start + 'data-ke-' + end;
+		})
+		.replace(/<table[^>]*\s+border="0"[^>]*>/ig, function(full) {
+			if (full.indexOf('ke-zeroborder') >= 0) {
+				return full;
+			}
+			return _addClassToTag(full, 'ke-zeroborder');
+		});
+	});
+});
+})(window);
diff --git a/public/assets/kindeditor/lang/ar.js b/public/assets/kindeditor/lang/ar.js
new file mode 100644
index 000000000..051619945
--- /dev/null
+++ b/public/assets/kindeditor/lang/ar.js
@@ -0,0 +1,233 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+* Arabic Translation By daif alotaibi (http://daif.net/)
+*******************************************************************************/
+
+KindEditor.lang({
+	source : 'عرض المصدر',
+	preview : 'معاينة الصفحة',
+	undo : 'تراجع(Ctrl+Z)',
+	redo : 'إعادة التراجع(Ctrl+Y)',
+	cut : 'قص(Ctrl+X)',
+	copy : 'نسخ(Ctrl+C)',
+	paste : 'لصق(Ctrl+V)',
+	plainpaste : 'لصق كنص عادي',
+	wordpaste : 'لصق من مايكروسفت ورد',
+	selectall : 'تحديد الكل',
+	justifyleft : 'محاذاه لليسار',
+	justifycenter : 'محاذاه للوسط',
+	justifyright : 'محاذاه لليمين',
+	justifyfull : 'محاذاه تلقائية',
+	insertorderedlist : 'قائمة مرقمه',
+	insertunorderedlist : 'قائمة نقطية',
+	indent : 'إزاحه النص',
+	outdent : 'إلغاء الازاحة',
+	subscript : 'أسفل النص',
+	superscript : 'أعلى النص',
+	formatblock : 'Paragraph format',
+	fontname : 'نوع الخط',
+	fontsize : 'حجم الخط',
+	forecolor : 'لون النص',
+	hilitecolor : 'لون خلفية النص',
+	bold : 'عريض(Ctrl+B)',
+	italic : 'مائل(Ctrl+I)',
+	underline : 'خط تحت النص(Ctrl+U)',
+	strikethrough : 'خط على النص',
+	removeformat : 'إزالة التنسيق',
+	image : 'إدراج صورة',
+	multiimage : 'Multi image',
+	flash : 'إدراج فلاش',
+	media : 'إدراج وسائط متعددة',
+	table : 'إدراج جدول',
+	tablecell : 'خلية',
+	hr : 'إدراج خط أفقي',
+	emoticons : 'إدراج وجه ضاحك',
+	link : 'رابط',
+	unlink : 'إزالة الرابط',
+	fullscreen : 'محرر ملئ الشاشة',
+	about : 'حول',
+	print : 'طباعة',
+	filemanager : 'مدير الملفات',
+	code : 'إدراج نص برمجي',
+	map : 'خرائط قووقل',
+	baidumap : 'خرائط قووقل',
+	lineheight : 'إرتفاع السطر',
+	clearhtml : 'مسح كود HTML',
+	pagebreak : 'إدراج فاصل صفحات',
+	quickformat : 'تنسيق سريع',
+	insertfile : 'إدراج ملف',
+	template : 'إدراج قالب',
+	anchor : 'رابط',
+	yes : 'موافق',
+	no : 'إلغاء',
+	close : 'إغلاق',
+	editImage : 'خصائص الصورة',
+	deleteImage : 'حذفالصورة',
+	editFlash : 'خصائص الفلاش',
+	deleteFlash : 'حذف الفلاش',
+	editMedia : 'خصائص الوسائط',
+	deleteMedia : 'حذف الوسائط',
+	editLink : 'خصائص الرابط',
+	deleteLink : 'إزالة الرابط',
+	tableprop : 'خصائص الجدول',
+	tablecellprop : 'خصائص الخلية',
+	tableinsert : 'إدراج جدول',
+	tabledelete : 'حذف جدول',
+	tablecolinsertleft : 'إدراج عمود لليسار',
+	tablecolinsertright : 'إدراج عمود لليسار',
+	tablerowinsertabove : 'إدراج صف للأعلى',
+	tablerowinsertbelow : 'إدراج صف للأسفل',
+	tablerowmerge : 'دمج للأسفل',
+	tablecolmerge : 'دمج لليمين',
+	tablerowsplit : 'تقسم الصف',
+	tablecolsplit : 'تقسيم العمود',
+	tablecoldelete : 'حذف العمود',
+	tablerowdelete : 'حذف الصف',
+	noColor : 'إفتراضي',
+	pleaseSelectFile : 'Please select file.',
+	invalidImg : "الرجاء إدخال رابط صحيح.\nالملفات المسموح بها: jpg,gif,bmp,png",
+	invalidMedia : "الرجاء إدخال رابط صحيح.\nالملفات المسموح بها: swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb",
+	invalidWidth : "العرض يجب أن يكون رقم.",
+	invalidHeight : "الإرتفاع يجب أن يكون رقم.",
+	invalidBorder : "عرض الحد يجب أن يكون رقم.",
+	invalidUrl : "الرجاء إدخال رابط حيح.",
+	invalidRows : 'صفوف غير صحيح.',
+	invalidCols : 'أعمدة غير صحيحة.',
+	invalidPadding : 'The padding must be number.',
+	invalidSpacing : 'The spacing must be number.',
+	invalidJson : 'Invalid JSON string.',
+	uploadSuccess : 'تم رفع الملف بنجاح.',
+	cutError : 'حاليا غير مدعومة من المتصفح, إستخدم إختصار لوحة المفاتيح (Ctrl+X).',
+	copyError : 'حاليا غير مدعومة من المتصفح, إستخدم إختصار لوحة المفاتيح (Ctrl+C).',
+	pasteError : 'حاليا غير مدعومة من المتصفح, إستخدم إختصار لوحة المفاتيح (Ctrl+V).',
+	ajaxLoading : 'Loading ...',
+	uploadLoading : 'Uploading ...',
+	uploadError : 'Upload Error',
+	'plainpaste.comment' : 'إستخدم إختصار لوحة المفاتيح (Ctrl+V) للصق داخل النافذة.',
+	'wordpaste.comment' : 'إستخدم إختصار لوحة المفاتيح (Ctrl+V) للصق داخل النافذة.',
+	'code.pleaseInput' : 'Please input code.',
+	'link.url' : 'الرابط',
+	'link.linkType' : 'الهدف',
+	'link.newWindow' : 'نافذة جديدة',
+	'link.selfWindow' : 'نفس النافذة',
+	'flash.url' : 'الرابط',
+	'flash.width' : 'العرض',
+	'flash.height' : 'الإرتفاع',
+	'flash.upload' : 'رفع',
+	'flash.viewServer' : 'أستعراض',
+	'media.url' : 'الرابط',
+	'media.width' : 'العرض',
+	'media.height' : 'الإرتفاع',
+	'media.autostart' : 'تشغيل تلقائي',
+	'media.upload' : 'رفع',
+	'media.viewServer' : 'أستعراض',
+	'image.remoteImage' : 'إدراج الرابط',
+	'image.localImage' : 'رفع',
+	'image.remoteUrl' : 'الرابط',
+	'image.localUrl' : 'الملف',
+	'image.size' : 'الحجم',
+	'image.width' : 'العرض',
+	'image.height' : 'الإرتفاع',
+	'image.resetSize' : 'إستعادة الأبعاد',
+	'image.align' : 'محاذاة',
+	'image.defaultAlign' : 'الإفتراضي',
+	'image.leftAlign' : 'اليسار',
+	'image.rightAlign' : 'اليمين',
+	'image.imgTitle' : 'العنوان',
+	'image.upload' : 'أستعراض',
+	'image.viewServer' : 'أستعراض',
+	'multiimage.uploadDesc' : 'Allows users to upload <%=uploadLimit%> images, single image size not exceeding <%=sizeLimit%>',
+	'multiimage.startUpload' : 'Start upload',
+	'multiimage.clearAll' : 'Clear all',
+	'multiimage.insertAll' : 'Insert all',
+	'multiimage.queueLimitExceeded' : 'Queue limit exceeded.',
+	'multiimage.fileExceedsSizeLimit' : 'File exceeds size limit.',
+	'multiimage.zeroByteFile' : 'Zero byte file.',
+	'multiimage.invalidFiletype' : 'Invalid file type.',
+	'multiimage.unknownError' : 'Unknown upload error.',
+	'multiimage.pending' : 'Pending ...',
+	'multiimage.uploadError' : 'Upload error',
+	'filemanager.emptyFolder' : 'فارغ',
+	'filemanager.moveup' : 'المجلد الأب',
+	'filemanager.viewType' : 'العرض: ',
+	'filemanager.viewImage' : 'مصغرات',
+	'filemanager.listImage' : 'قائمة',
+	'filemanager.orderType' : 'الترتيب: ',
+	'filemanager.fileName' : 'بالإسم',
+	'filemanager.fileSize' : 'بالحجم',
+	'filemanager.fileType' : 'بالنوع',
+	'insertfile.url' : 'الرابط',
+	'insertfile.title' : 'العنوان',
+	'insertfile.upload' : 'رفع',
+	'insertfile.viewServer' : 'أستعراض',
+	'table.cells' : 'خلايا',
+	'table.rows' : 'صفوف',
+	'table.cols' : 'أعمدة',
+	'table.size' : 'الأبعاد',
+	'table.width' : 'العرض',
+	'table.height' : 'الإرتفاع',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : 'الخارج',
+	'table.padding' : 'الداخل',
+	'table.spacing' : 'الفراغات',
+	'table.align' : 'محاذاه',
+	'table.textAlign' : 'افقى',
+	'table.verticalAlign' : 'رأسي',
+	'table.alignDefault' : 'إفتراضي',
+	'table.alignLeft' : 'يسار',
+	'table.alignCenter' : 'وسط',
+	'table.alignRight' : 'يمين',
+	'table.alignTop' : 'أعلى',
+	'table.alignMiddle' : 'منتصف',
+	'table.alignBottom' : 'أسفل',
+	'table.alignBaseline' : 'Baseline',
+	'table.border' : 'الحدود',
+	'table.borderWidth' : 'العرض',
+	'table.borderColor' : 'اللون',
+	'table.backgroundColor' : 'الخلفية',
+	'map.address' : 'العنوان: ',
+	'map.search' : 'بحث',
+	'baidumap.address' : 'العنوان: ',
+	'baidumap.search' : 'بحث',
+	'baidumap.insertDynamicMap' : 'Dynamic Map',
+	'anchor.name' : 'إسم الرابط',
+	'formatblock.formatBlock' : {
+		h1 : 'عنوان 1',
+		h2 : 'عنوان 2',
+		h3 : 'عنوان 3',
+		h4 : 'عنوان 4',
+		p : 'عادي'
+	},
+	'fontname.fontName' : {
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Comic Sans MS' : 'Comic Sans MS',
+		'Courier New' : 'Courier New',
+		'Garamond' : 'Garamond',
+		'Georgia' : 'Georgia',
+		'Tahoma' : 'Tahoma',
+		'Times New Roman' : 'Times New Roman',
+		'Trebuchet MS' : 'Trebuchet MS',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : 'إرتفاع السطر 1'},
+		{'1.5' : 'إرتفاع السطر 1.5'},
+		{'2' : 'إرتفاع السطر 2'},
+		{'2.5' : 'إرتفاع السطر 2.5'},
+		{'3' : 'إرتفاع السطر 3'}
+	],
+	'template.selectTemplate' : 'قالب',
+	'template.replaceContent' : 'إستبدال المحتوى الحالي',
+	'template.fileList' : {
+		'1.html' : 'صورة ونص',
+		'2.html' : 'جدول',
+		'3.html' : 'قائمة'
+	}
+}, 'ar');
diff --git a/public/assets/kindeditor/lang/en.js b/public/assets/kindeditor/lang/en.js
new file mode 100644
index 000000000..39ce90983
--- /dev/null
+++ b/public/assets/kindeditor/lang/en.js
@@ -0,0 +1,232 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : 'Source',
+	preview : 'Preview',
+	undo : 'Undo(Ctrl+Z)',
+	redo : 'Redo(Ctrl+Y)',
+	cut : 'Cut(Ctrl+X)',
+	copy : 'Copy(Ctrl+C)',
+	paste : 'Paste(Ctrl+V)',
+	plainpaste : 'Paste as plain text',
+	wordpaste : 'Paste from Word',
+	selectall : 'Select all',
+	justifyleft : 'Align left',
+	justifycenter : 'Align center',
+	justifyright : 'Align right',
+	justifyfull : 'Align full',
+	insertorderedlist : 'Ordered list',
+	insertunorderedlist : 'Unordered list',
+	indent : 'Increase indent',
+	outdent : 'Decrease indent',
+	subscript : 'Subscript',
+	superscript : 'Superscript',
+	formatblock : 'Paragraph format',
+	fontname : 'Font family',
+	fontsize : 'Font size',
+	forecolor : 'Text color',
+	hilitecolor : 'Highlight color',
+	bold : 'Bold(Ctrl+B)',
+	italic : 'Italic(Ctrl+I)',
+	underline : 'Underline(Ctrl+U)',
+	strikethrough : 'Strikethrough',
+	removeformat : 'Remove format',
+	image : 'Image',
+	multiimage : 'Multi image',
+	flash : 'Flash',
+	media : 'Embeded media',
+	table : 'Table',
+	tablecell : 'Cell',
+	hr : 'Insert horizontal line',
+	emoticons : 'Insert emoticon',
+	link : 'Link',
+	unlink : 'Unlink',
+	fullscreen : 'Toggle fullscreen mode',
+	about : 'About',
+	print : 'Print',
+	filemanager : 'File Manager',
+	code : 'Insert code',
+	map : 'Google Maps',
+	baidumap : 'Baidu Maps',
+	lineheight : 'Line height',
+	clearhtml : 'Clear HTML code',
+	pagebreak : 'Insert Page Break',
+	quickformat : 'Quick Format',
+	insertfile : 'Insert file',
+	template : 'Insert Template',
+	anchor : 'Anchor',
+	yes : 'OK',
+	no : 'Cancel',
+	close : 'Close',
+	editImage : 'Image properties',
+	deleteImage : 'Delete image',
+	editFlash : 'Flash properties',
+	deleteFlash : 'Delete flash',
+	editMedia : 'Media properties',
+	deleteMedia : 'Delete media',
+	editLink : 'Link properties',
+	deleteLink : 'Unlink',
+	tableprop : 'Table properties',
+	tablecellprop : 'Cell properties',
+	tableinsert : 'Insert table',
+	tabledelete : 'Delete table',
+	tablecolinsertleft : 'Insert column left',
+	tablecolinsertright : 'Insert column right',
+	tablerowinsertabove : 'Insert row above',
+	tablerowinsertbelow : 'Insert row below',
+	tablerowmerge : 'Merge down',
+	tablecolmerge : 'Merge right',
+	tablerowsplit : 'Split row',
+	tablecolsplit : 'Split column',
+	tablecoldelete : 'Delete column',
+	tablerowdelete : 'Delete row',
+	noColor : 'Default',
+	pleaseSelectFile : 'Please select file.',
+	invalidImg : "Please type valid URL.\nAllowed file extension: jpg,gif,bmp,png",
+	invalidMedia : "Please type valid URL.\nAllowed file extension: swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb",
+	invalidWidth : "The width must be number.",
+	invalidHeight : "The height must be number.",
+	invalidBorder : "The border must be number.",
+	invalidUrl : "Please type valid URL.",
+	invalidRows : 'Invalid rows.',
+	invalidCols : 'Invalid columns.',
+	invalidPadding : 'The padding must be number.',
+	invalidSpacing : 'The spacing must be number.',
+	invalidJson : 'Invalid JSON string.',
+	uploadSuccess : 'Upload success.',
+	cutError : 'Currently not supported by your browser, use keyboard shortcut(Ctrl+X) instead.',
+	copyError : 'Currently not supported by your browser, use keyboard shortcut(Ctrl+C) instead.',
+	pasteError : 'Currently not supported by your browser, use keyboard shortcut(Ctrl+V) instead.',
+	ajaxLoading : 'Loading ...',
+	uploadLoading : 'Uploading ...',
+	uploadError : 'Upload Error',
+	'plainpaste.comment' : 'Use keyboard shortcut(Ctrl+V) to paste the text into the window.',
+	'wordpaste.comment' : 'Use keyboard shortcut(Ctrl+V) to paste the text into the window.',
+	'code.pleaseInput' : 'Please input code.',
+	'link.url' : 'URL',
+	'link.linkType' : 'Target',
+	'link.newWindow' : 'New window',
+	'link.selfWindow' : 'Same window',
+	'flash.url' : 'URL',
+	'flash.width' : 'Width',
+	'flash.height' : 'Height',
+	'flash.upload' : 'Upload',
+	'flash.viewServer' : 'Browse',
+	'media.url' : 'URL',
+	'media.width' : 'Width',
+	'media.height' : 'Height',
+	'media.autostart' : 'Auto start',
+	'media.upload' : 'Upload',
+	'media.viewServer' : 'Browse',
+	'image.remoteImage' : 'Insert URL',
+	'image.localImage' : 'Upload',
+	'image.remoteUrl' : 'URL',
+	'image.localUrl' : 'File',
+	'image.size' : 'Size',
+	'image.width' : 'Width',
+	'image.height' : 'Height',
+	'image.resetSize' : 'Reset dimensions',
+	'image.align' : 'Align',
+	'image.defaultAlign' : 'Default',
+	'image.leftAlign' : 'Left',
+	'image.rightAlign' : 'Right',
+	'image.imgTitle' : 'Title',
+	'image.upload' : 'Browse',
+	'image.viewServer' : 'Browse',
+	'multiimage.uploadDesc' : 'Allows users to upload <%=uploadLimit%> images, single image size not exceeding <%=sizeLimit%>',
+	'multiimage.startUpload' : 'Start upload',
+	'multiimage.clearAll' : 'Clear all',
+	'multiimage.insertAll' : 'Insert all',
+	'multiimage.queueLimitExceeded' : 'Queue limit exceeded.',
+	'multiimage.fileExceedsSizeLimit' : 'File exceeds size limit.',
+	'multiimage.zeroByteFile' : 'Zero byte file.',
+	'multiimage.invalidFiletype' : 'Invalid file type.',
+	'multiimage.unknownError' : 'Unknown upload error.',
+	'multiimage.pending' : 'Pending ...',
+	'multiimage.uploadError' : 'Upload error',
+	'filemanager.emptyFolder' : 'Blank',
+	'filemanager.moveup' : 'Parent folder',
+	'filemanager.viewType' : 'Display: ',
+	'filemanager.viewImage' : 'Thumbnails',
+	'filemanager.listImage' : 'List',
+	'filemanager.orderType' : 'Sorting: ',
+	'filemanager.fileName' : 'By name',
+	'filemanager.fileSize' : 'By size',
+	'filemanager.fileType' : 'By type',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : 'Title',
+	'insertfile.upload' : 'Upload',
+	'insertfile.viewServer' : 'Browse',
+	'table.cells' : 'Cells',
+	'table.rows' : 'Rows',
+	'table.cols' : 'Columns',
+	'table.size' : 'Dimensions',
+	'table.width' : 'Width',
+	'table.height' : 'Height',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : 'Space',
+	'table.padding' : 'Padding',
+	'table.spacing' : 'Spacing',
+	'table.align' : 'Align',
+	'table.textAlign' : 'Horizontal',
+	'table.verticalAlign' : 'Vertical',
+	'table.alignDefault' : 'Default',
+	'table.alignLeft' : 'Left',
+	'table.alignCenter' : 'Center',
+	'table.alignRight' : 'Right',
+	'table.alignTop' : 'Top',
+	'table.alignMiddle' : 'Middle',
+	'table.alignBottom' : 'Bottom',
+	'table.alignBaseline' : 'Baseline',
+	'table.border' : 'Border',
+	'table.borderWidth' : 'Width',
+	'table.borderColor' : 'Color',
+	'table.backgroundColor' : 'Background',
+	'map.address' : 'Address: ',
+	'map.search' : 'Search',
+	'baidumap.address' : 'Address: ',
+	'baidumap.search' : 'Search',
+	'baidumap.insertDynamicMap' : 'Dynamic Map',
+	'anchor.name' : 'Anchor name',
+	'formatblock.formatBlock' : {
+		h1 : 'Heading 1',
+		h2 : 'Heading 2',
+		h3 : 'Heading 3',
+		h4 : 'Heading 4',
+		p : 'Normal'
+	},
+	'fontname.fontName' : {
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Comic Sans MS' : 'Comic Sans MS',
+		'Courier New' : 'Courier New',
+		'Garamond' : 'Garamond',
+		'Georgia' : 'Georgia',
+		'Tahoma' : 'Tahoma',
+		'Times New Roman' : 'Times New Roman',
+		'Trebuchet MS' : 'Trebuchet MS',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : 'Line height 1'},
+		{'1.5' : 'Line height 1.5'},
+		{'2' : 'Line height 2'},
+		{'2.5' : 'Line height 2.5'},
+		{'3' : 'Line height 3'}
+	],
+	'template.selectTemplate' : 'Template',
+	'template.replaceContent' : 'Replace current content',
+	'template.fileList' : {
+		'1.html' : 'Image and Text',
+		'2.html' : 'Table',
+		'3.html' : 'List'
+	}
+}, 'en');
diff --git a/public/assets/kindeditor/lang/ko.js b/public/assets/kindeditor/lang/ko.js
new file mode 100644
index 000000000..23410428b
--- /dev/null
+++ b/public/assets/kindeditor/lang/ko.js
@@ -0,0 +1,237 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Composite <ukjinplant@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : '소스',
+	preview : '미리보기',
+	undo : '작업취소(Ctrl+Z)',
+	redo : '작업재개(Ctrl+Y)',
+	cut : '잘라내기(Ctrl+X)',
+	copy : '복사(Ctrl+C)',
+	paste : '붙여넣기(Ctrl+V)',
+	plainpaste : '일반 텍스트로 붙여넣기',
+	wordpaste : '워드 문서로 붙여넣기',
+	selectall : '전체 선택',
+	justifyleft : '왼쪽 정렬',
+	justifycenter : '가운데 정렬',
+	justifyright : '오른쪽 정렬',
+	justifyfull : '양쪽 정렬',
+	insertorderedlist : '순서 목록',
+	insertunorderedlist : '비순서 목록',
+	indent : '들여쓰기',
+	outdent : '내어쓰기',
+	subscript : '아랫첨자',
+	superscript : '윗첨자',
+	formatblock : '문단 형식',
+	fontname : '글꼴',
+	fontsize : '글자 크기',
+	forecolor : '글자색',
+	hilitecolor : '강조색',
+	bold : '굵게(Ctrl+B)',
+	italic : '이텔릭(Ctrl+I)',
+	underline : '빝줄(Ctrl+U)',
+	strikethrough : '취소선',
+	removeformat : '형식 제거',
+	image : '이미지 추가',
+	multiimage : '여러 이미지 추가',
+	flash : '플래시 추가',
+	media : '미디어 추가',
+	table : '표',
+	tablecell : '열',
+	hr : '구분선 추가',
+	emoticons : '이모티콘 추가',
+	link : '링크',
+	unlink : '링크 제거',
+	fullscreen : '전체 화면 모드',
+	about : '이 에디터는...',
+	print : '인쇄',
+	filemanager : '파일 관리자',
+	code : '코드 추가',
+	map : '구글 맵 추가',
+	baidumap : '바이두 맵 추가',
+	lineheight : '행 간격',
+	clearhtml : 'HTML 코드 정리',
+	pagebreak : '페이지 구분 추가',
+	quickformat : '빠른 형식',
+	insertfile : '파일 추가',
+	template : '템플릿 추가',
+	anchor : '책갈피',
+	yes : '확인',
+	no : '취소',
+	close : '닫기',
+	editImage : '이미지 속성',
+	deleteImage : '이미지 삭제',
+	editFlash : '플래시 속성',
+	deleteFlash : '플래시 삭제',
+	editMedia : '미디어 속성',
+	deleteMedia : '미디어 삭제',
+	editLink : '링크 속성',
+	deleteLink : '링크 삭제',
+	tableprop : '표 속성',
+	tablecellprop : '열 속성',
+	tableinsert : '표 추가',
+	tabledelete : '표 삭제',
+	tablecolinsertleft : '왼쪽으로 열 추가',
+	tablecolinsertright : '오른쪽으로 열 추가',
+	tablerowinsertabove : '위쪽으로 열 추가',
+	tablerowinsertbelow : '아래쪽으로 열 추가',
+	tablerowmerge : '아래로 병합',
+	tablecolmerge : '오른쪽으로 병합',
+	tablerowsplit : '행 나누기',
+	tablecolsplit : '열 나누기',
+	tablecoldelete : '열 삭제',
+	tablerowdelete : '행 삭제',
+	noColor : '기본색',
+	pleaseSelectFile : '파일 선택',
+	invalidImg : "올바른 주소를 입력하세요.\njpg,gif,bmp,png 형식이 가능합니다.",
+	invalidMedia : "올바른 주소를 입력하세요.\nswf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb 형식이 가능합니다.",
+	invalidWidth : "넓이 값은 숫자여야 합니다.",
+	invalidHeight : "높이 값은 숫자여야 합니다.",
+	invalidBorder : "굵기 값은 숫자여야 합니다.",
+	invalidUrl : "올바른 주소를 입력하세요.",
+	invalidRows : '올바른 행이 아닙니다.',
+	invalidCols : '올바른 열이 아닙니다.',
+	invalidPadding : '안쪽 여백 값은 숫자여야 합니다.',
+	invalidSpacing : '간격 길이 값은 숫자여야 합니다.',
+	invalidJson : '올바른 JSON 형식이 아닙니다.',
+	uploadSuccess : '업로드가 완료되었습니다.',
+	cutError : '브라우저가 잘라내기 기능을 지원하지 않습니다, 단축키로 대신 사용하세요. (Ctrl+X)',
+	copyError : '브라우저가 복사 기능을 지원하지 않습니다, 단축키로 대신 사용하세요. (Ctrl+X)',
+	pasteError : '브라우저가 붙여넣기 기능을 지원하지 않습니다, 단축키로 대신 사용하세요. (Ctrl+X)',
+	ajaxLoading : '불러오는 중 ...',
+	uploadLoading : '업로드 중 ...',
+	uploadError : '업로드 오류',
+	'plainpaste.comment' : '단축키(Ctrl+V)를 통하여 여기에 텍스트를 붙여넣으세요.',
+	'wordpaste.comment' : '단축키(Ctrl+V)를 통하여 여기에 워드 텍스트를 붙여넣으세요.',
+	'code.pleaseInput' : 'Please input code.',
+	'link.url' : '주소',
+	'link.linkType' : '창',
+	'link.newWindow' : '새 창',
+	'link.selfWindow' : '현재 창',
+	'flash.url' : '주소',
+	'flash.width' : '넓이',
+	'flash.height' : '높이',
+	'flash.upload' : '업로드',
+	'flash.viewServer' : '찾아보기',
+	'media.url' : '주소',
+	'media.width' : '넓이',
+	'media.height' : '높이',
+	'media.autostart' : '자동 시작',
+	'media.upload' : '업로드',
+	'media.viewServer' : '찾아보기',
+	'image.remoteImage' : '외부 이미지',
+	'image.localImage' : '내부 이미지',
+	'image.remoteUrl' : '주소',
+	'image.localUrl' : '파일',
+	'image.size' : '크기',
+	'image.width' : '넓이',
+	'image.height' : '높이',
+	'image.resetSize' : '기본 크기로',
+	'image.align' : '정렬',
+	'image.defaultAlign' : '기본',
+	'image.leftAlign' : '왼쪽',
+	'image.rightAlign' : '오른쪽',
+	'image.imgTitle' : '제목',
+	'image.upload' : '찾아보기',
+	'image.viewServer' : '찾아보기',
+	'multiimage.uploadDesc' : '최대 이미지 개수: <%=uploadLimit%>개, 개당 이미지 크기: <%=sizeLimit%>',
+	'multiimage.startUpload' : '업로드 시작',
+	'multiimage.clearAll' : '모두 삭제',
+	'multiimage.insertAll' : '모두 삽입',
+	'multiimage.queueLimitExceeded' : '업로드 개수가 초과되었습니다.',
+	'multiimage.fileExceedsSizeLimit' : '업로드 크기가 초과되었습니다.',
+	'multiimage.zeroByteFile' : '파일 크기가 없습니다.',
+	'multiimage.invalidFiletype' : '올바른 이미지가 아닙니다.',
+	'multiimage.unknownError' : '알 수 없는 업로드 오류가 발생하였습니다.',
+	'multiimage.pending' : '처리 중 ...',
+	'multiimage.uploadError' : '업로드 오류',
+	'filemanager.emptyFolder' : '빈 폴더',
+	'filemanager.moveup' : '위로',
+	'filemanager.viewType' : '보기 방식: ',
+	'filemanager.viewImage' : '미리 보기',
+	'filemanager.listImage' : '목록',
+	'filemanager.orderType' : '정렬 방식: ',
+	'filemanager.fileName' : '이름별',
+	'filemanager.fileSize' : '크기별',
+	'filemanager.fileType' : '종류별',
+	'insertfile.url' : '주소',
+	'insertfile.title' : '제목',
+	'insertfile.upload' : '업로드',
+	'insertfile.viewServer' : '찾아보기',
+	'table.cells' : '열',
+	'table.rows' : '행',
+	'table.cols' : '열',
+	'table.size' : '표 크기',
+	'table.width' : '넓이',
+	'table.height' : '높이',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : '간격',
+	'table.padding' : '안쪽여백',
+	'table.spacing' : '간격',
+	'table.align' : '정렬',
+	'table.textAlign' : '수직',
+	'table.verticalAlign' : '수평',
+	'table.alignDefault' : '기본',
+	'table.alignLeft' : '왼쪽',
+	'table.alignCenter' : '가운데',
+	'table.alignRight' : '오른쪽',
+	'table.alignTop' : '위쪽',
+	'table.alignMiddle' : '중간',
+	'table.alignBottom' : '아래쪽',
+	'table.alignBaseline' : '글자기준',
+	'table.border' : '테두리',
+	'table.borderWidth' : '크기',
+	'table.borderColor' : '색상',
+	'table.backgroundColor' : '배경',
+	'map.address' : '주소: ',
+	'map.search' : '검색',
+	'baidumap.address' : '주소: ',
+	'baidumap.search' : '검색',
+	'baidumap.insertDynamicMap' : '동적 지도',
+	'anchor.name' : '책갈피명',
+	'formatblock.formatBlock' : {
+		h1 : '제목 1',
+		h2 : '제목 2',
+		h3 : '제목 3',
+		h4 : '제목 4',
+		p : '본문'
+	},
+	'fontname.fontName' : {
+		'Gulim' : '굴림',
+		'Dotum' : '돋움',
+		'Batang' : '바탕',
+		'Gungsuh' : '궁서',
+		'Malgun Gothic' : '맑은 고딕',
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Comic Sans MS' : 'Comic Sans MS',
+		'Courier New' : 'Courier New',
+		'Garamond' : 'Garamond',
+		'Georgia' : 'Georgia',
+		'Tahoma' : 'Tahoma',
+		'Times New Roman' : 'Times New Roman',
+		'Trebuchet MS' : 'Trebuchet MS',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '행간 1'},
+		{'1.5' : '행간 1.5'},
+		{'2' : '행간 2'},
+		{'2.5' : '행간 2.5'},
+		{'3' : '행간 3'}
+	],
+	'template.selectTemplate' : '템플릿',
+	'template.replaceContent' : '내용 바꾸기',
+	'template.fileList' : {
+		'1.html' : '이미지와 텍스트',
+		'2.html' : '표',
+		'3.html' : '목록'
+	}
+}, 'ko');
diff --git a/public/assets/kindeditor/lang/zh_CN.js b/public/assets/kindeditor/lang/zh_CN.js
new file mode 100644
index 000000000..c8506f313
--- /dev/null
+++ b/public/assets/kindeditor/lang/zh_CN.js
@@ -0,0 +1,236 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : 'HTML代码',
+	preview : '预览',
+	undo : '后退(Ctrl+Z)',
+	redo : '前进(Ctrl+Y)',
+	cut : '剪切(Ctrl+X)',
+	copy : '复制(Ctrl+C)',
+	paste : '粘贴(Ctrl+V)',
+	plainpaste : '粘贴为无格式文本',
+	wordpaste : '从Word粘贴',
+	selectall : '全选(Ctrl+A)',
+	justifyleft : '左对齐',
+	justifycenter : '居中',
+	justifyright : '右对齐',
+	justifyfull : '两端对齐',
+	insertorderedlist : '编号',
+	insertunorderedlist : '项目符号',
+	indent : '增加缩进',
+	outdent : '减少缩进',
+	subscript : '下标',
+	superscript : '上标',
+	formatblock : '段落',
+	fontname : '字体',
+	fontsize : '文字大小',
+	forecolor : '文字颜色',
+	hilitecolor : '文字背景',
+	bold : '粗体(Ctrl+B)',
+	italic : '斜体(Ctrl+I)',
+	underline : '下划线(Ctrl+U)',
+	strikethrough : '删除线',
+	removeformat : '删除格式',
+	image : '图片',
+	multiimage : '批量图片上传',
+	flash : 'Flash',
+	media : '视音频',
+	table : '表格',
+	tablecell : '单元格',
+	hr : '插入横线',
+	emoticons : '插入表情',
+	link : '超级链接',
+	unlink : '取消超级链接',
+	fullscreen : '全屏显示',
+	about : '关于',
+	print : '打印(Ctrl+P)',
+	filemanager : '文件空间',
+	code : '插入程序代码',
+	map : 'Google地图',
+	baidumap : '百度地图',
+	lineheight : '行距',
+	clearhtml : '清理HTML代码',
+	pagebreak : '插入分页符',
+	quickformat : '一键排版',
+	insertfile : '插入文件',
+	template : '插入模板',
+	anchor : '锚点',
+	yes : '确定',
+	no : '取消',
+	close : '关闭',
+	editImage : '图片属性',
+	deleteImage : '删除图片',
+	editFlash : 'Flash属性',
+	deleteFlash : '删除Flash',
+	editMedia : '视音频属性',
+	deleteMedia : '删除视音频',
+	editLink : '超级链接属性',
+	deleteLink : '取消超级链接',
+	editAnchor : '锚点属性',
+	deleteAnchor : '删除锚点',
+	tableprop : '表格属性',
+	tablecellprop : '单元格属性',
+	tableinsert : '插入表格',
+	tabledelete : '删除表格',
+	tablecolinsertleft : '左侧插入列',
+	tablecolinsertright : '右侧插入列',
+	tablerowinsertabove : '上方插入行',
+	tablerowinsertbelow : '下方插入行',
+	tablerowmerge : '向下合并单元格',
+	tablecolmerge : '向右合并单元格',
+	tablerowsplit : '拆分行',
+	tablecolsplit : '拆分列',
+	tablecoldelete : '删除列',
+	tablerowdelete : '删除行',
+	noColor : '无颜色',
+	pleaseSelectFile : '请选择文件。',
+	invalidImg : "请输入有效的URL地址。\n只允许jpg,gif,bmp,png格式。",
+	invalidMedia : "请输入有效的URL地址。\n只允许swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb格式。",
+	invalidWidth : "宽度必须为数字。",
+	invalidHeight : "高度必须为数字。",
+	invalidBorder : "边框必须为数字。",
+	invalidUrl : "请输入有效的URL地址。",
+	invalidRows : '行数为必选项，只允许输入大于0的数字。',
+	invalidCols : '列数为必选项，只允许输入大于0的数字。',
+	invalidPadding : '边距必须为数字。',
+	invalidSpacing : '间距必须为数字。',
+	invalidJson : '服务器发生故障。',
+	uploadSuccess : '上传成功。',
+	cutError : '您的浏览器安全设置不允许使用剪切操作，请使用快捷键(Ctrl+X)来完成。',
+	copyError : '您的浏览器安全设置不允许使用复制操作，请使用快捷键(Ctrl+C)来完成。',
+	pasteError : '您的浏览器安全设置不允许使用粘贴操作，请使用快捷键(Ctrl+V)来完成。',
+	ajaxLoading : '加载中，请稍候 ...',
+	uploadLoading : '上传中，请稍候 ...',
+	uploadError : '上传错误',
+	'plainpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'wordpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'code.pleaseInput' : '请输入程序代码。',
+	'link.url' : 'URL',
+	'link.linkType' : '打开类型',
+	'link.newWindow' : '新窗口',
+	'link.selfWindow' : '当前窗口',
+	'flash.url' : 'URL',
+	'flash.width' : '宽度',
+	'flash.height' : '高度',
+	'flash.upload' : '上传',
+	'flash.viewServer' : '文件空间',
+	'media.url' : 'URL',
+	'media.width' : '宽度',
+	'media.height' : '高度',
+	'media.autostart' : '自动播放',
+	'media.upload' : '上传',
+	'media.viewServer' : '文件空间',
+	'image.remoteImage' : '网络图片',
+	'image.localImage' : '本地上传',
+	'image.remoteUrl' : '图片地址',
+	'image.localUrl' : '上传文件',
+	'image.size' : '图片大小',
+	'image.width' : '宽',
+	'image.height' : '高',
+	'image.resetSize' : '重置大小',
+	'image.align' : '对齐方式',
+	'image.defaultAlign' : '默认方式',
+	'image.leftAlign' : '左对齐',
+	'image.rightAlign' : '右对齐',
+	'image.imgTitle' : '图片说明',
+	'image.upload' : '浏览...',
+	'image.viewServer' : '图片空间',
+	'multiimage.uploadDesc' : '允许用户同时上传<%=uploadLimit%>张图片，单张图片容量不超过<%=sizeLimit%>',
+	'multiimage.startUpload' : '开始上传',
+	'multiimage.clearAll' : '全部清空',
+	'multiimage.insertAll' : '全部插入',
+	'multiimage.queueLimitExceeded' : '文件数量超过限制。',
+	'multiimage.fileExceedsSizeLimit' : '文件大小超过限制。',
+	'multiimage.zeroByteFile' : '无法上传空文件。',
+	'multiimage.invalidFiletype' : '文件类型不正确。',
+	'multiimage.unknownError' : '发生异常，无法上传。',
+	'multiimage.pending' : '等待上传',
+	'multiimage.uploadError' : '上传失败',
+	'filemanager.emptyFolder' : '空文件夹',
+	'filemanager.moveup' : '移到上一级文件夹',
+	'filemanager.viewType' : '显示方式：',
+	'filemanager.viewImage' : '缩略图',
+	'filemanager.listImage' : '详细信息',
+	'filemanager.orderType' : '排序方式：',
+	'filemanager.fileName' : '名称',
+	'filemanager.fileSize' : '大小',
+	'filemanager.fileType' : '类型',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : '文件说明',
+	'insertfile.upload' : '上传',
+	'insertfile.viewServer' : '文件空间',
+	'table.cells' : '单元格数',
+	'table.rows' : '行数',
+	'table.cols' : '列数',
+	'table.size' : '大小',
+	'table.width' : '宽度',
+	'table.height' : '高度',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : '边距间距',
+	'table.padding' : '边距',
+	'table.spacing' : '间距',
+	'table.align' : '对齐方式',
+	'table.textAlign' : '水平对齐',
+	'table.verticalAlign' : '垂直对齐',
+	'table.alignDefault' : '默认',
+	'table.alignLeft' : '左对齐',
+	'table.alignCenter' : '居中',
+	'table.alignRight' : '右对齐',
+	'table.alignTop' : '顶部',
+	'table.alignMiddle' : '中部',
+	'table.alignBottom' : '底部',
+	'table.alignBaseline' : '基线',
+	'table.border' : '边框',
+	'table.borderWidth' : '边框',
+	'table.borderColor' : '颜色',
+	'table.backgroundColor' : '背景颜色',
+	'map.address' : '地址: ',
+	'map.search' : '搜索',
+	'baidumap.address' : '地址: ',
+	'baidumap.search' : '搜索',
+	'baidumap.insertDynamicMap' : '插入动态地图',
+	'anchor.name' : '锚点名称',
+	'formatblock.formatBlock' : {
+		h1 : '标题 1',
+		h2 : '标题 2',
+		h3 : '标题 3',
+		h4 : '标题 4',
+		p : '正 文'
+	},
+	'fontname.fontName' : {
+		'SimSun' : '宋体',
+		'NSimSun' : '新宋体',
+		'FangSong_GB2312' : '仿宋_GB2312',
+		'KaiTi_GB2312' : '楷体_GB2312',
+		'SimHei' : '黑体',
+		'Microsoft YaHei' : '微软雅黑',
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Times New Roman' : 'Times New Roman',
+		'Courier New' : 'Courier New',
+		'Tahoma' : 'Tahoma',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '单倍行距'},
+		{'1.5' : '1.5倍行距'},
+		{'2' : '2倍行距'},
+		{'2.5' : '2.5倍行距'},
+		{'3' : '3倍行距'}
+	],
+	'template.selectTemplate' : '可选模板',
+	'template.replaceContent' : '替换当前内容',
+	'template.fileList' : {
+		'1.html' : '图片和文字',
+		'2.html' : '表格',
+		'3.html' : '项目编号'
+	}
+}, 'zh_CN');
diff --git a/public/assets/kindeditor/lang/zh_TW.js b/public/assets/kindeditor/lang/zh_TW.js
new file mode 100644
index 000000000..ceac2afd9
--- /dev/null
+++ b/public/assets/kindeditor/lang/zh_TW.js
@@ -0,0 +1,235 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : '原始碼',
+	preview : '預覽',
+	undo : '復原(Ctrl+Z)',
+	redo : '重複(Ctrl+Y)',
+	cut : '剪下(Ctrl+X)',
+	copy : '複製(Ctrl+C)',
+	paste : '貼上(Ctrl+V)',
+	plainpaste : '貼為純文字格式',
+	wordpaste : '自Word貼上',
+	selectall : '全選(Ctrl+A)',
+	justifyleft : '靠左對齊',
+	justifycenter : '置中',
+	justifyright : '靠右對齊',
+	justifyfull : '左右對齊',
+	insertorderedlist : '編號清單',
+	insertunorderedlist : '項目清單',
+	indent : '增加縮排',
+	outdent : '減少縮排',
+	subscript : '下標',
+	superscript : '上標',
+	formatblock : '標題',
+	fontname : '字體',
+	fontsize : '文字大小',
+	forecolor : '文字顏色',
+	hilitecolor : '背景顏色',
+	bold : '粗體(Ctrl+B)',
+	italic : '斜體(Ctrl+I)',
+	underline : '底線(Ctrl+U)',
+	strikethrough : '刪除線',
+	removeformat : '清除格式',
+	image : '影像',
+	multiimage : '批量影像上傳',
+	flash : 'Flash',
+	media : '多媒體',
+	table : '表格',
+	hr : '插入水平線',
+	emoticons : '插入表情',
+	link : '超連結',
+	unlink : '移除超連結',
+	fullscreen : '最大化',
+	about : '關於',
+	print : '列印(Ctrl+P)',
+	fileManager : '瀏覽伺服器',
+	code : '插入程式代碼',
+	map : 'Google地圖',
+	baidumap : 'Baidu地圖',
+	lineheight : '行距',
+	clearhtml : '清理HTML代碼',
+	pagebreak : '插入分頁符號',
+	quickformat : '快速排版',
+	insertfile : '插入文件',
+	template : '插入樣板',
+	anchor : '錨點',
+	yes : '確定',
+	no : '取消',
+	close : '關閉',
+	editImage : '影像屬性',
+	deleteImage : '刪除影像',
+	editFlash : 'Flash屬性',
+	deleteFlash : '删除Flash',
+	editMedia : '多媒體屬性',
+	deleteMedia : '删除多媒體',
+	editLink : '超連結屬性',
+	deleteLink : '移除超連結',
+	tableprop : '表格屬性',
+	tablecellprop : '儲存格屬性',
+	tableinsert : '插入表格',
+	tabledelete : '刪除表格',
+	tablecolinsertleft : '向左插入列',
+	tablecolinsertright : '向右插入列',
+	tablerowinsertabove : '向上插入欄',
+	tablerowinsertbelow : '下方插入欄',
+	tablerowmerge : '向下合併單元格',
+	tablecolmerge : '向右合併單元格',
+	tablerowsplit : '分割欄',
+	tablecolsplit : '分割列',
+	tablecoldelete : '删除列',
+	tablerowdelete : '删除欄',
+	noColor : '自動',
+	pleaseSelectFile : '請選擇文件。',
+	invalidImg : "請輸入有效的URL。\n只允許jpg,gif,bmp,png格式。",
+	invalidMedia : "請輸入有效的URL。\n只允許swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb格式。",
+	invalidWidth : "寬度必須是數字。",
+	invalidHeight : "高度必須是數字。",
+	invalidBorder : "邊框必須是數字。",
+	invalidUrl : "請輸入有效的URL。",
+	invalidRows : '欄數是必須輸入項目，只允許輸入大於0的數字。',
+	invalidCols : '列數是必須輸入項目，只允許輸入大於0的數字。',
+	invalidPadding : '內距必須是數字。',
+	invalidSpacing : '間距必須是數字。',
+	invalidBorder : '边框必须为数字。',
+	pleaseInput : "請輸入內容。",
+	invalidJson : '伺服器發生故障。',
+	uploadSuccess : '上傳成功。',
+	cutError : '您的瀏覽器安全設置不允許使用剪下操作，請使用快捷鍵(Ctrl+X)完成。',
+	copyError : '您的瀏覽器安全設置不允許使用剪下操作，請使用快捷鍵(Ctrl+C)完成。',
+	pasteError : '您的瀏覽器安全設置不允許使用剪下操作，請使用快捷鍵(Ctrl+V)完成。',
+	ajaxLoading : '加載中，請稍候 ...',
+	uploadLoading : '上傳中，請稍候 ...',
+	uploadError : '上傳錯誤',
+	'plainpaste.comment' : '請使用快捷鍵(Ctrl+V)把內容貼到下方區域裡。',
+	'wordpaste.comment' : '請使用快捷鍵(Ctrl+V)把內容貼到下方區域裡。',
+	'code.pleaseInput' : 'Please input code.',
+	'link.url' : 'URL',
+	'link.linkType' : '打開類型',
+	'link.newWindow' : '新窗口',
+	'link.selfWindow' : '本頁窗口',
+	'flash.url' : 'URL',
+	'flash.width' : '寬度',
+	'flash.height' : '高度',
+	'flash.upload' : '上傳',
+	'flash.viewServer' : '瀏覽',
+	'media.url' : 'URL',
+	'media.width' : '寬度',
+	'media.height' : '高度',
+	'media.autostart' : '自動播放',
+	'media.upload' : '上傳',
+	'media.viewServer' : '瀏覽',
+	'image.remoteImage' : '網絡影像',
+	'image.localImage' : '上傳影像',
+	'image.remoteUrl' : '影像URL',
+	'image.localUrl' : '影像URL',
+	'image.size' : '影像大小',
+	'image.width' : '寬度',
+	'image.height' : '高度',
+	'image.resetSize' : '原始大小',
+	'image.align' : '對齊方式',
+	'image.defaultAlign' : '未設定',
+	'image.leftAlign' : '向左對齊',
+	'image.rightAlign' : '向右對齊',
+	'image.imgTitle' : '影像說明',
+	'image.upload' : '瀏覽...',
+	'image.viewServer' : '瀏覽...',
+	'multiimage.uploadDesc' : 'Allows users to upload <%=uploadLimit%> images, single image size not exceeding <%=sizeLimit%>',
+	'multiimage.startUpload' : 'Start upload',
+	'multiimage.clearAll' : 'Clear all',
+	'multiimage.insertAll' : 'Insert all',
+	'multiimage.queueLimitExceeded' : 'Queue limit exceeded.',
+	'multiimage.fileExceedsSizeLimit' : 'File exceeds size limit.',
+	'multiimage.zeroByteFile' : 'Zero byte file.',
+	'multiimage.invalidFiletype' : 'Invalid file type.',
+	'multiimage.unknownError' : 'Unknown upload error.',
+	'multiimage.pending' : 'Pending ...',
+	'multiimage.uploadError' : 'Upload error',
+	'filemanager.emptyFolder' : '空文件夾',
+	'filemanager.moveup' : '至上一級文件夾',
+	'filemanager.viewType' : '顯示方式：',
+	'filemanager.viewImage' : '縮略圖',
+	'filemanager.listImage' : '詳細信息',
+	'filemanager.orderType' : '排序方式：',
+	'filemanager.fileName' : '名稱',
+	'filemanager.fileSize' : '大小',
+	'filemanager.fileType' : '類型',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : '文件說明',
+	'insertfile.upload' : '上傳',
+	'insertfile.viewServer' : '瀏覽',
+	'table.cells' : '儲存格數',
+	'table.rows' : '欄數',
+	'table.cols' : '列數',
+	'table.size' : '表格大小',
+	'table.width' : '寬度',
+	'table.height' : '高度',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : '內距間距',
+	'table.padding' : '內距',
+	'table.spacing' : '間距',
+	'table.align' : '對齊方式',
+	'table.textAlign' : '水平對齊',
+	'table.verticalAlign' : '垂直對齊',
+	'table.alignDefault' : '未設定',
+	'table.alignLeft' : '向左對齊',
+	'table.alignCenter' : '置中',
+	'table.alignRight' : '向右對齊',
+	'table.alignTop' : '靠上',
+	'table.alignMiddle' : '置中',
+	'table.alignBottom' : '靠下',
+	'table.alignBaseline' : '基線',
+	'table.border' : '表格邊框',
+	'table.borderWidth' : '邊框',
+	'table.borderColor' : '顏色',
+	'table.backgroundColor' : '背景顏色',
+	'map.address' : '住所: ',
+	'map.search' : '尋找',
+	'baidumap.address' : '住所: ',
+	'baidumap.search' : '尋找',
+	'baidumap.insertDynamicMap' : '插入動態地圖',
+	'anchor.name' : '錨點名稱',
+	'formatblock.formatBlock' : {
+		h1 : '標題 1',
+		h2 : '標題 2',
+		h3 : '標題 3',
+		h4 : '標題 4',
+		p : '一般'
+	},
+	'fontname.fontName' : {
+		'MingLiU' : '細明體',
+		'PMingLiU' : '新細明體',
+		'DFKai-SB' : '標楷體',
+		'SimSun' : '宋體',
+		'NSimSun' : '新宋體',
+		'FangSong' : '仿宋體',
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Times New Roman' : 'Times New Roman',
+		'Courier New' : 'Courier New',
+		'Tahoma' : 'Tahoma',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '单倍行距'},
+		{'1.5' : '1.5倍行距'},
+		{'2' : '2倍行距'},
+		{'2.5' : '2.5倍行距'},
+		{'3' : '3倍行距'}
+	],
+	'template.selectTemplate' : '可選樣板',
+	'template.replaceContent' : '取代當前內容',
+	'template.fileList' : {
+		'1.html' : '影像和文字',
+		'2.html' : '表格',
+		'3.html' : '项目清單'
+	}
+}, 'zh_TW');
diff --git a/public/assets/kindeditor/plugins/anchor/anchor.js b/public/assets/kindeditor/plugins/anchor/anchor.js
new file mode 100644
index 000000000..55ab89468
--- /dev/null
+++ b/public/assets/kindeditor/plugins/anchor/anchor.js
@@ -0,0 +1,46 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('anchor', function(K) {
+	var self = this, name = 'anchor', lang = self.lang(name + '.');
+	self.plugin.anchor = {
+		edit : function() {
+			var html = ['<div style="padding:20px;">',
+					'<div class="ke-dialog-row">',
+					'<label for="keName">' + lang.name + '</label>',
+					'<input class="ke-input-text" type="text" id="keName" name="name" value="" style="width:100px;" />',
+					'</div>',
+					'</div>'].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 300,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						self.insertHtml('<a name="' + nameBox.val() + '">').hideDialog().focus();
+					}
+				}
+			});
+			var div = dialog.div,
+				nameBox = K('input[name="name"]', div);
+			var img = self.plugin.getSelectedAnchor();
+			if (img) {
+				nameBox.val(unescape(img.attr('data-ke-name')));
+			}
+			nameBox[0].focus();
+			nameBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedAnchor().remove();
+		}
+	};
+	self.clickToolbar(name, self.plugin.anchor.edit);
+});
diff --git a/public/assets/kindeditor/plugins/autoheight/autoheight.js b/public/assets/kindeditor/plugins/autoheight/autoheight.js
new file mode 100644
index 000000000..546578bfa
--- /dev/null
+++ b/public/assets/kindeditor/plugins/autoheight/autoheight.js
@@ -0,0 +1,54 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('autoheight', function(K) {
+	var self = this;
+
+	if (!self.autoHeightMode) {
+		return;
+	}
+
+	var minHeight;
+
+	function hideScroll() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe[0].scroll = 'no';
+		body.style.overflowY = 'hidden';
+	}
+
+	function resetHeight() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe.height(minHeight);
+		self.resize(null, Math.max((K.IE ? body.scrollHeight : body.offsetHeight) + 76, minHeight));
+	}
+
+	function init() {
+		minHeight = K.removeUnit(self.height);
+
+		self.edit.afterChange(resetHeight);
+		hideScroll();
+		resetHeight();
+	}
+
+	if (self.isCreated) {
+		init();
+	} else {
+		self.afterCreate(init);
+	}
+});
+
+/*
+* 如何实现真正的自动高度？
+* 修改编辑器高度之后，再次获取body内容高度时，最小值只会是当前iframe的设置高度，这样就导致高度只增不减。
+* 所以每次获取body内容高度之前，先将iframe的高度重置为最小高度，这样就能获取body的实际高度。
+* 由此就实现了真正的自动高度
+* 测试：chrome、firefox、IE9、IE8
+* */
diff --git a/public/assets/kindeditor/plugins/baidumap/baidumap.js b/public/assets/kindeditor/plugins/baidumap/baidumap.js
new file mode 100644
index 000000000..12751c441
--- /dev/null
+++ b/public/assets/kindeditor/plugins/baidumap/baidumap.js
@@ -0,0 +1,93 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// Baidu Maps: http://dev.baidu.com/wiki/map/index.php?title=%E9%A6%96%E9%A1%B5
+
+KindEditor.plugin('baidumap', function(K) {
+	var self = this, name = 'baidumap', lang = self.lang(name + '.');
+	var mapWidth = K.undef(self.mapWidth, 558);
+	var mapHeight = K.undef(self.mapHeight, 360);
+	self.clickToolbar(name, function() {
+		var html = ['<div style="padding:10px 20px;">',
+			'<div class="ke-header">',
+			// left start
+			'<div class="ke-left">',
+			lang.address + ' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" name="searchBtn" class="ke-button-common ke-button" value="' + lang.search + '" />',
+			'</span>',
+			'</div>',
+			// right start
+			'<div class="ke-right">',
+			'<input type="checkbox" id="keInsertDynamicMap" name="insertDynamicMap" value="1" /> <label for="keInsertDynamicMap">' + lang.insertDynamicMap + '</label>',
+			'</div>',
+			'<div class="ke-clearfix"></div>',
+			'</div>',
+			'<div class="ke-map" style="width:' + mapWidth + 'px;height:' + mapHeight + 'px;"></div>',
+			'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : mapWidth + 42,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var map = win.map;
+					var centerObj = map.getCenter();
+					var center = centerObj.lng + ',' + centerObj.lat;
+					var zoom = map.getZoom();
+					var url = [checkbox[0].checked ? self.pluginsPath + 'baidumap/index.html' : 'http://api.map.baidu.com/staticimage',
+						'?center=' + encodeURIComponent(center),
+						'&zoom=' + encodeURIComponent(zoom),
+						'&width=' + mapWidth,
+						'&height=' + mapHeight,
+						'&markers=' + encodeURIComponent(center),
+						'&markerStyles=' + encodeURIComponent('l,A')].join('');
+					if (checkbox[0].checked) {
+						self.insertHtml('<iframe src="' + url + '" frameborder="0" style="width:' + (mapWidth + 2) + 'px;height:' + (mapHeight + 2) + 'px;"></iframe>');
+					} else {
+						self.exec('insertimage', url);
+					}
+					self.hideDialog().focus();
+				}
+			},
+			beforeRemove : function() {
+				searchBtn.remove();
+				if (doc) {
+					doc.write('');
+				}
+				iframe.remove();
+			}
+		});
+		var div = dialog.div,
+			addressBox = K('[name="address"]', div),
+			searchBtn = K('[name="searchBtn"]', div),
+			checkbox = K('[name="insertDynamicMap"]', dialog.div),
+			win, doc;
+		var iframe = K('<iframe class="ke-textarea" frameborder="0" src="' + self.pluginsPath + 'baidumap/map.html" style="width:' + mapWidth + 'px;height:' + mapHeight + 'px;"></iframe>');
+		function ready() {
+			win = iframe[0].contentWindow;
+			doc = K.iframeDoc(iframe);
+		}
+		iframe.bind('load', function() {
+			iframe.unbind('load');
+			if (K.IE) {
+				ready();
+			} else {
+				setTimeout(ready, 0);
+			}
+		});
+		K('.ke-map', div).replaceWith(iframe);
+		// search map
+		searchBtn.click(function() {
+			win.search(addressBox.val());
+		});
+	});
+});
diff --git a/public/assets/kindeditor/plugins/baidumap/index.html b/public/assets/kindeditor/plugins/baidumap/index.html
new file mode 100644
index 000000000..e106d1ac1
--- /dev/null
+++ b/public/assets/kindeditor/plugins/baidumap/index.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta charset="utf-8" />
+<meta name="keywords" content="百度地图,百度地图API，百度地图自定义工具，百度地图所见即所得工具" />
+<meta name="description" content="百度地图API自定义地图，帮助用户在可视化操作下生成百度地图" />
+<title>百度地图API自定义地图</title>
+<!--引用百度地图API-->
+<style type="text/css">
+	html,body{margin:0;padding:0;}
+	.iw_poi_title {color:#CC5522;font-size:14px;font-weight:bold;overflow:hidden;padding-right:13px;white-space:nowrap}
+	.iw_poi_content {font:12px arial,sans-serif;overflow:visible;padding-top:4px;white-space:-moz-pre-wrap;word-wrap:break-word}
+</style>
+<script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
+</head>
+
+<body onload="initMap();">
+  <!--百度地图容器-->
+  <div style="width:697px;height:550px;border:#ccc solid 1px;" id="dituContent"></div>
+</body>
+<script type="text/javascript">
+	function getParam(name) {
+		return location.href.match(new RegExp('[?&]' + name + '=([^?&]+)', 'i')) ? decodeURIComponent(RegExp.$1) : '';
+	}
+	var centerParam = getParam('center');
+	var zoomParam = getParam('zoom');
+	var widthParam = getParam('width');
+	var heightParam = getParam('height');
+	var markersParam = getParam('markers');
+	var markerStylesParam = getParam('markerStyles');
+
+	//创建和初始化地图函数：
+	function initMap(){
+		// [FF]切换模式后报错
+		if (!window.BMap) {
+			return;
+		}
+		var dituContent = document.getElementById('dituContent');
+		dituContent.style.width = widthParam + 'px';
+		dituContent.style.height = heightParam + 'px';
+
+		createMap();//创建地图
+		setMapEvent();//设置地图事件
+		addMapControl();//向地图添加控件
+
+		// 创建标注
+		var markersArr = markersParam.split(',');
+		var point = new BMap.Point(markersArr[0], markersArr[1]);
+		var marker = new BMap.Marker(point);
+		map.addOverlay(marker); // 将标注添加到地图中
+	}
+
+	//创建地图函数：
+	function createMap(){
+		var map = new BMap.Map("dituContent");//在百度地图容器中创建一个地图
+		var centerArr = centerParam.split(',');
+		var point = new BMap.Point(centerArr[0], centerArr[1]);//定义一个中心点坐标
+		map.centerAndZoom(point, zoomParam);//设定地图的中心点和坐标并将地图显示在地图容器中
+		window.map = map;//将map变量存储在全局
+	}
+
+	//地图事件设置函数：
+	function setMapEvent(){
+		map.enableDragging();//启用地图拖拽事件，默认启用(可不写)
+		map.enableScrollWheelZoom();//启用地图滚轮放大缩小
+		map.enableDoubleClickZoom();//启用鼠标双击放大，默认启用(可不写)
+		map.enableKeyboard();//启用键盘上下左右键移动地图
+	}
+
+	//地图控件添加函数：
+	function addMapControl(){
+		//向地图中添加缩放控件
+	var ctrl_nav = new BMap.NavigationControl({anchor:BMAP_ANCHOR_TOP_LEFT,type:BMAP_NAVIGATION_CONTROL_LARGE});
+	map.addControl(ctrl_nav);
+		//向地图中添加缩略图控件
+	var ctrl_ove = new BMap.OverviewMapControl({anchor:BMAP_ANCHOR_BOTTOM_RIGHT,isOpen:1});
+	map.addControl(ctrl_ove);
+		//向地图中添加比例尺控件
+	var ctrl_sca = new BMap.ScaleControl({anchor:BMAP_ANCHOR_BOTTOM_LEFT});
+	map.addControl(ctrl_sca);
+	}
+</script>
+</html>
\ No newline at end of file
diff --git a/public/assets/kindeditor/plugins/baidumap/map.html b/public/assets/kindeditor/plugins/baidumap/map.html
new file mode 100644
index 000000000..b65ea1d6b
--- /dev/null
+++ b/public/assets/kindeditor/plugins/baidumap/map.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<title>Baidu Maps</title>
+		<style>
+			html { height: 100% }
+			body { height: 100%; margin: 0; padding: 0; background-color: #FFF }
+		</style>
+		<script charset="utf-8" src="http://api.map.baidu.com/api?v=1.3"></script>
+		<script>
+			var map, geocoder;
+			function initialize() {
+				map = new BMap.Map('map_canvas');
+				var point = new BMap.Point(121.473704, 31.230393);
+				map.centerAndZoom(point, 11);
+				map.addControl(new BMap.NavigationControl());
+				map.enableScrollWheelZoom();
+
+				var gc = new BMap.Geocoder();
+				gc.getLocation(point, function(rs){
+					var addComp = rs.addressComponents;
+					var address = [addComp.city].join('');
+					parent.document.getElementById("kindeditor_plugin_map_address").value = address;
+				});
+			}
+			function search(address) {
+				if (!map) return;
+				var local = new BMap.LocalSearch(map, {
+					renderOptions: {
+						map: map,
+						autoViewport: true,
+						selectFirstResult: false
+					}
+				});
+				local.search(address);
+			}
+		</script>
+	</head>
+	<body onload="initialize();">
+		<div id="map_canvas" style="width:100%; height:100%"></div>
+	</body>
+</html>
diff --git a/public/assets/kindeditor/plugins/clearhtml/clearhtml.js b/public/assets/kindeditor/plugins/clearhtml/clearhtml.js
new file mode 100644
index 000000000..1bf0e5dca
--- /dev/null
+++ b/public/assets/kindeditor/plugins/clearhtml/clearhtml.js
@@ -0,0 +1,29 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('clearhtml', function(K) {
+	var self = this, name = 'clearhtml';
+	self.clickToolbar(name, function() {
+		self.focus();
+		var html = self.html();
+		html = html.replace(/(<script[^>]*>)([\s\S]*?)(<\/script>)/ig, '');
+		html = html.replace(/(<style[^>]*>)([\s\S]*?)(<\/style>)/ig, '');
+		html = K.formatHtml(html, {
+			a : ['href', 'target'],
+			embed : ['src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+			img : ['src', 'width', 'height', 'border', 'alt', 'title', '.width', '.height'],
+			table : ['border'],
+			'td,th' : ['rowspan', 'colspan'],
+			'div,hr,br,tbody,tr,p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : []
+		});
+		self.html(html);
+		self.cmd.selection(true);
+		self.addBookmark();
+	});
+});
diff --git a/public/assets/kindeditor/plugins/code/code.js b/public/assets/kindeditor/plugins/code/code.js
new file mode 100644
index 000000000..85e42259b
--- /dev/null
+++ b/public/assets/kindeditor/plugins/code/code.js
@@ -0,0 +1,62 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// google code prettify: http://google-code-prettify.googlecode.com/
+// http://google-code-prettify.googlecode.com/
+
+KindEditor.plugin('code', function(K) {
+	var self = this, name = 'code';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = ['<div style="padding:10px 20px;">',
+				'<div class="ke-dialog-row">',
+				'<select class="ke-code-type">',
+				'<option value="js">JavaScript</option>',
+				'<option value="html">HTML</option>',
+				'<option value="css">CSS</option>',
+				'<option value="php">PHP</option>',
+				'<option value="pl">Perl</option>',
+				'<option value="py">Python</option>',
+				'<option value="rb">Ruby</option>',
+				'<option value="java">Java</option>',
+				'<option value="vb">ASP/VB</option>',
+				'<option value="cpp">C/C++</option>',
+				'<option value="cs">C#</option>',
+				'<option value="xml">XML</option>',
+				'<option value="bsh">Shell</option>',
+				'<option value="">Other</option>',
+				'</select>',
+				'</div>',
+				'<textarea class="ke-textarea" style="width:408px;height:260px;"></textarea>',
+				'</div>'].join(''),
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var type = K('.ke-code-type', dialog.div).val(),
+							code = textarea.val(),
+							cls = type === '' ? '' :  ' lang-' + type,
+							html = '<pre class="prettyprint' + cls + '">\n' + K.escape(code) + '</pre> ';
+						if (K.trim(code) === '') {
+							alert(lang.pleaseInput);
+							textarea[0].focus();
+							return;
+						}
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			textarea = K('textarea', dialog.div);
+		textarea[0].focus();
+	});
+});
diff --git a/public/assets/kindeditor/plugins/code/prettify.css b/public/assets/kindeditor/plugins/code/prettify.css
new file mode 100644
index 000000000..b8287e5f6
--- /dev/null
+++ b/public/assets/kindeditor/plugins/code/prettify.css
@@ -0,0 +1,13 @@
+.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
+
+pre.prettyprint {
+	border: 0;
+	border-left: 3px solid rgb(204, 204, 204);
+	margin-left: 2em;
+	padding: 0.5em;
+	font-size: 110%;
+	display: block;
+	font-family: "Consolas", "Monaco", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;
+	margin: 1em 0px;
+	white-space: pre;
+}
diff --git a/public/assets/kindeditor/plugins/code/prettify.js b/public/assets/kindeditor/plugins/code/prettify.js
new file mode 100644
index 000000000..eef5ad7e6
--- /dev/null
+++ b/public/assets/kindeditor/plugins/code/prettify.js
@@ -0,0 +1,28 @@
+var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;
+(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return f;var b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return a}function h(a){for(var f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a=
+[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c<i;++c){var j=f[c];if(/\\[bdsw]/i.test(j))a.push(j);else{var j=m(j),d;c+2<i&&"-"===f[c+1]?(d=m(f[c+2]),c+=2):d=j;b.push([j,d]);d<65||j>122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;c<b.length;++c)i=b[c],i[0]<=j[1]+1?j[1]=Math.max(j[1],i[1]):f.push(j=i);b=["["];o&&b.push("^");b.push.apply(b,a);for(c=0;c<
+f.length;++c)i=f[c],b.push(e(i[0])),i[1]>i[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return b.join("")}function y(a){for(var f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c<b;++c){var j=f[c];j==="("?++i:"\\"===j.charAt(0)&&(j=+j.substring(1))&&j<=i&&(d[j]=-1)}for(c=1;c<d.length;++c)-1===d[c]&&(d[c]=++t);for(i=c=0;c<b;++c)j=f[c],j==="("?(++i,d[i]===void 0&&(f[c]="(?:")):"\\"===j.charAt(0)&&
+(j=+j.substring(1))&&j<=i&&(f[c]="\\"+d[i]);for(i=c=0;c<b;++c)"^"===f[c]&&"^"!==f[c+1]&&(f[c]="");if(a.ignoreCase&&s)for(c=0;c<b;++c)j=f[c],a=j.charAt(0),j.length>=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p<d;++p){var g=a[p];if(g.ignoreCase)l=!0;else if(/[a-z]/i.test(g.source.replace(/\\u[\da-f]{4}|\\x[\da-f]{2}|\\[^UXux]/gi,""))){s=!0;l=!1;break}}for(var r=
+{b:8,t:9,n:10,v:11,f:12,r:13},n=[],p=0,d=a.length;p<d;++p){g=a[p];if(g.global||g.multiline)throw Error(""+g);n.push("(?:"+y(g)+")")}return RegExp(n.join("|"),l?"gi":"g")}function M(a){function m(a){switch(a.nodeType){case 1:if(e.test(a.className))break;for(var g=a.firstChild;g;g=g.nextSibling)m(g);g=a.nodeName;if("BR"===g||"LI"===g)h[s]="\n",t[s<<1]=y++,t[s++<<1|1]=a;break;case 3:case 4:g=a.nodeValue,g.length&&(g=p?g.replace(/\r\n?/g,"\n"):g.replace(/[\t\n\r ]+/g," "),h[s]=g,t[s<<1]=y,y+=g.length,
+t[s++<<1|1]=a)}}var e=/(?:^|\s)nocode(?:\s|$)/,h=[],y=0,t=[],s=0,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=document.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);m(a);return{a:h.join("").replace(/\n$/,""),c:t}}function B(a,m,e,h){m&&(a={a:m,d:a},e(a),h.push.apply(h,a.e))}function x(a,m){function e(a){for(var l=a.d,p=[l,"pln"],d=0,g=a.a.match(y)||[],r={},n=0,z=g.length;n<z;++n){var f=g[n],b=r[f],o=void 0,c;if(typeof b===
+"string")c=!1;else{var i=h[f.charAt(0)];if(i)o=f.match(i[1]),b=i[0];else{for(c=0;c<t;++c)if(i=m[c],o=f.match(i[1])){b=i[0];break}o||(b="pln")}if((c=b.length>=5&&"lang-"===b.substring(0,5))&&!(o&&typeof o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m),
+l=[],p={},d=0,g=e.length;d<g;++d){var r=e[d],n=r[3];if(n)for(var k=n.length;--k>=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var t=m.length;return e}function u(a){var m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/,
+q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):m.push(["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,q])):m.push(["com",/^#[^\n\r]*/,
+q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]*/,q]),e.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^ | $/g,
+"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"|")+")\\b"),q]);m.push(["pln",/^\s+/,q," \r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]*/,q]);return x(m,e)}function D(a,m){function e(a){switch(a.nodeType){case 1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a),
+a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var b=a.nodeValue,d=b.match(t);if(d){var c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c||a.parentNode.removeChild(a)}}}}function h(a){function b(a,d){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e}
+for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var k=/(?:^|\s)nocode(?:\s|$)/,t=/\r\n?|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var d=[l],g=0;g<d.length;++g)e(d[g]);m===(m|0)&&d[0].setAttribute("value",
+m);var r=s.createElement("OL");r.className="linenums";for(var n=Math.max(0,m-1|0)||0,g=0,z=d.length;g<z;++g)l=d[g],l.className="L"+(g+n)%10,l.firstChild||l.appendChild(s.createTextNode("\xa0")),r.appendChild(l);a.appendChild(r)}function k(a,m){for(var e=m.length;--e>=0;){var h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override language handler %s",h):A[h]=a}}function C(a,m){if(!a||!A.hasOwnProperty(a))a=/^\s*</.test(m)?"default-markup":"default-code";return A[a]}function E(a){var m=
+a.g;try{var e=M(a.h),h=e.a;a.a=h;a.c=e.c;a.d=0;C(m,h)(a);var k=/\bMSIE\b/.test(navigator.userAgent),m=/\n/g,t=a.a,s=t.length,e=0,l=a.c,p=l.length,h=0,d=a.e,g=d.length,a=0;d[g]=s;var r,n;for(n=r=0;n<g;)d[n]!==d[n+2]?(d[r++]=d[n++],d[r++]=d[n++]):n+=2;g=r;for(n=r=0;n<g;){for(var z=d[n],f=d[n+1],b=n+2;b+2<=g&&d[b+1]===f;)b+=2;d[r++]=z;d[r++]=f;n=b}for(d.length=r;h<p;){var o=l[h+2]||s,c=d[a+2]||s,b=Math.min(o,c),i=l[h+1],j;if(i.nodeType!==1&&(j=t.substring(e,b))){k&&(j=j.replace(m,"\r"));i.nodeValue=
+j;var u=i.ownerDocument,v=u.createElement("SPAN");v.className=d[a+1];var x=i.parentNode;x.replaceChild(v,i);v.appendChild(i);e<o&&(l[h+1]=i=u.createTextNode(t.substring(b,o)),x.insertBefore(i,v.nextSibling))}e=b;e>=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in window&&console.log(w&&w.stack?w.stack:w)}}var v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],
+"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"],
+H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],
+J=[v,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/,N=/\S/,O=u({keywords:[F,H,w,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END"+
+I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^<?]+/],["dec",/^<!\w[^>]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),
+["default-markup","htm","html","mxml","xhtml","xml","xsl"]);k(x([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css",
+/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}),
+["cv","py"]);k(u({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes",
+hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a,m,e){var h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return h.innerHTML};window.prettyPrint=function(a){function m(){for(var e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p<h.length&&l.now()<e;p++){var n=h[p],k=n.className;if(k.indexOf("prettyprint")>=0){var k=k.match(g),f,b;if(b=
+!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"||o.tagName==="code"||o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b||((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}p<h.length?setTimeout(m,
+250):a&&a()}for(var e=[document.getElementsByTagName("pre"),document.getElementsByTagName("code"),document.getElementsByTagName("xmp")],h=[],k=0;k<e.length;++k)for(var t=0,s=e[k].length;t<s;++t)h.push(e[k][t]);var e=q,l=Date;l.now||(l={now:function(){return+new Date}});var p=0,d,g=/\blang(?:uage)?-([\w.]+)(?!\S)/;m()};window.PR={createSimpleLexer:x,registerLangHandler:k,sourceDecorator:u,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",
+PR_NOCODE:"nocode",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ"}})();
diff --git a/public/assets/kindeditor/plugins/emoticons/emoticons.js b/public/assets/kindeditor/plugins/emoticons/emoticons.js
new file mode 100644
index 000000000..a9900668b
--- /dev/null
+++ b/public/assets/kindeditor/plugins/emoticons/emoticons.js
@@ -0,0 +1,129 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('emoticons', function(K) {
+	var self = this, name = 'emoticons',
+		path = (self.emoticonsPath || self.pluginsPath + 'emoticons/images/'),
+		allowPreview = self.allowPreviewEmoticons === undefined ? true : self.allowPreviewEmoticons,
+		currentPageNum = 1;
+	self.clickToolbar(name, function() {
+		var rows = 5, cols = 9, total = 135, startNum = 0,
+			cells = rows * cols, pages = Math.ceil(total / cells),
+			colsHalf = Math.floor(cols / 2),
+			wrapperDiv = K('<div class="ke-plugin-emoticons"></div>'),
+			elements = [],
+			menu = self.createMenu({
+				name : name,
+				beforeRemove : function() {
+					removeEvent();
+				}
+			});
+		menu.div.append(wrapperDiv);
+		var previewDiv, previewImg;
+		if (allowPreview) {
+			previewDiv = K('<div class="ke-preview"></div>').css('right', 0);
+			previewImg = K('<img class="ke-preview-img" src="' + path + startNum + '.gif" />');
+			wrapperDiv.append(previewDiv);
+			previewDiv.append(previewImg);
+		}
+		function bindCellEvent(cell, j, num) {
+			if (previewDiv) {
+				cell.mouseover(function() {
+					if (j > colsHalf) {
+						previewDiv.css('left', 0);
+						previewDiv.css('right', '');
+					} else {
+						previewDiv.css('left', '');
+						previewDiv.css('right', 0);
+					}
+					previewImg.attr('src', path + num + '.gif');
+					K(this).addClass('ke-on');
+				});
+			} else {
+				cell.mouseover(function() {
+					K(this).addClass('ke-on');
+				});
+			}
+			cell.mouseout(function() {
+				K(this).removeClass('ke-on');
+			});
+			cell.click(function(e) {
+				self.insertHtml('<img src="' + path + num + '.gif" border="0" alt="" />').hideMenu().focus();
+				e.stop();
+			});
+		}
+		function createEmoticonsTable(pageNum, parentDiv) {
+			var table = document.createElement('table');
+			parentDiv.append(table);
+			if (previewDiv) {
+				K(table).mouseover(function() {
+					previewDiv.show('block');
+				});
+				K(table).mouseout(function() {
+					previewDiv.hide();
+				});
+				elements.push(K(table));
+			}
+			table.className = 'ke-table';
+			table.cellPadding = 0;
+			table.cellSpacing = 0;
+			table.border = 0;
+			var num = (pageNum - 1) * cells + startNum;
+			for (var i = 0; i < rows; i++) {
+				var row = table.insertRow(i);
+				for (var j = 0; j < cols; j++) {
+					var cell = K(row.insertCell(j));
+					cell.addClass('ke-cell');
+					bindCellEvent(cell, j, num);
+					var span = K('<span class="ke-img"></span>')
+						.css('background-position', '-' + (24 * num) + 'px 0px')
+						.css('background-image', 'url(' + path + 'static.gif)');
+					cell.append(span);
+					elements.push(cell);
+					num++;
+				}
+			}
+			return table;
+		}
+		var table = createEmoticonsTable(currentPageNum, wrapperDiv);
+		function removeEvent() {
+			K.each(elements, function() {
+				this.unbind();
+			});
+		}
+		var pageDiv;
+		function bindPageEvent(el, pageNum) {
+			el.click(function(e) {
+				removeEvent();
+				table.parentNode.removeChild(table);
+				pageDiv.remove();
+				table = createEmoticonsTable(pageNum, wrapperDiv);
+				createPageTable(pageNum);
+				currentPageNum = pageNum;
+				e.stop();
+			});
+		}
+		function createPageTable(currentPageNum) {
+			pageDiv = K('<div class="ke-page"></div>');
+			wrapperDiv.append(pageDiv);
+			for (var pageNum = 1; pageNum <= pages; pageNum++) {
+				if (currentPageNum !== pageNum) {
+					var a = K('<a href="javascript:;">[' + pageNum + ']</a>');
+					bindPageEvent(a, pageNum);
+					pageDiv.append(a);
+					elements.push(a);
+				} else {
+					pageDiv.append(K('@[' + pageNum + ']'));
+				}
+				pageDiv.append(K('@&nbsp;'));
+			}
+		}
+		createPageTable(currentPageNum);
+	});
+});
diff --git a/public/assets/kindeditor/plugins/emoticons/images/0.gif b/public/assets/kindeditor/plugins/emoticons/images/0.gif
new file mode 100644
index 000000000..5be27cb0e
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/0.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/1.gif b/public/assets/kindeditor/plugins/emoticons/images/1.gif
new file mode 100644
index 000000000..a2644a9ee
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/1.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/10.gif b/public/assets/kindeditor/plugins/emoticons/images/10.gif
new file mode 100644
index 000000000..905c15be3
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/10.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/100.gif b/public/assets/kindeditor/plugins/emoticons/images/100.gif
new file mode 100644
index 000000000..92ad35d2b
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/100.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/101.gif b/public/assets/kindeditor/plugins/emoticons/images/101.gif
new file mode 100644
index 000000000..1f27663ae
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/101.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/102.gif b/public/assets/kindeditor/plugins/emoticons/images/102.gif
new file mode 100644
index 000000000..748ded1ac
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/102.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/103.gif b/public/assets/kindeditor/plugins/emoticons/images/103.gif
new file mode 100644
index 000000000..be9eaa054
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/103.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/104.gif b/public/assets/kindeditor/plugins/emoticons/images/104.gif
new file mode 100644
index 000000000..d7c206631
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/104.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/105.gif b/public/assets/kindeditor/plugins/emoticons/images/105.gif
new file mode 100644
index 000000000..2f353cadc
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/105.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/106.gif b/public/assets/kindeditor/plugins/emoticons/images/106.gif
new file mode 100644
index 000000000..51935349b
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/106.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/107.gif b/public/assets/kindeditor/plugins/emoticons/images/107.gif
new file mode 100644
index 000000000..70d38d3bb
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/107.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/108.gif b/public/assets/kindeditor/plugins/emoticons/images/108.gif
new file mode 100644
index 000000000..749d50083
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/108.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/109.gif b/public/assets/kindeditor/plugins/emoticons/images/109.gif
new file mode 100644
index 000000000..6f57d5642
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/109.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/11.gif b/public/assets/kindeditor/plugins/emoticons/images/11.gif
new file mode 100644
index 000000000..b512dd5da
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/11.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/110.gif b/public/assets/kindeditor/plugins/emoticons/images/110.gif
new file mode 100644
index 000000000..e253abcff
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/110.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/111.gif b/public/assets/kindeditor/plugins/emoticons/images/111.gif
new file mode 100644
index 000000000..0c567233d
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/111.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/112.gif b/public/assets/kindeditor/plugins/emoticons/images/112.gif
new file mode 100644
index 000000000..c8ddce88a
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/112.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/113.gif b/public/assets/kindeditor/plugins/emoticons/images/113.gif
new file mode 100644
index 000000000..272710453
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/113.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/114.gif b/public/assets/kindeditor/plugins/emoticons/images/114.gif
new file mode 100644
index 000000000..53918e2ae
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/114.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/115.gif b/public/assets/kindeditor/plugins/emoticons/images/115.gif
new file mode 100644
index 000000000..4db336973
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/115.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/116.gif b/public/assets/kindeditor/plugins/emoticons/images/116.gif
new file mode 100644
index 000000000..57326bd2f
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/116.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/117.gif b/public/assets/kindeditor/plugins/emoticons/images/117.gif
new file mode 100644
index 000000000..14611b6ef
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/117.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/118.gif b/public/assets/kindeditor/plugins/emoticons/images/118.gif
new file mode 100644
index 000000000..8c255004c
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/118.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/119.gif b/public/assets/kindeditor/plugins/emoticons/images/119.gif
new file mode 100644
index 000000000..65bb468b9
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/119.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/12.gif b/public/assets/kindeditor/plugins/emoticons/images/12.gif
new file mode 100644
index 000000000..547529cab
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/12.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/120.gif b/public/assets/kindeditor/plugins/emoticons/images/120.gif
new file mode 100644
index 000000000..5ce77c05f
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/120.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/121.gif b/public/assets/kindeditor/plugins/emoticons/images/121.gif
new file mode 100644
index 000000000..a021abaa6
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/121.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/122.gif b/public/assets/kindeditor/plugins/emoticons/images/122.gif
new file mode 100644
index 000000000..9a79e111c
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/122.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/123.gif b/public/assets/kindeditor/plugins/emoticons/images/123.gif
new file mode 100644
index 000000000..b9480be25
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/123.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/124.gif b/public/assets/kindeditor/plugins/emoticons/images/124.gif
new file mode 100644
index 000000000..7fed47728
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/124.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/125.gif b/public/assets/kindeditor/plugins/emoticons/images/125.gif
new file mode 100644
index 000000000..e2c3c11c9
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/125.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/126.gif b/public/assets/kindeditor/plugins/emoticons/images/126.gif
new file mode 100644
index 000000000..24105c988
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/126.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/127.gif b/public/assets/kindeditor/plugins/emoticons/images/127.gif
new file mode 100644
index 000000000..0cead364a
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/127.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/128.gif b/public/assets/kindeditor/plugins/emoticons/images/128.gif
new file mode 100644
index 000000000..318586181
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/128.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/129.gif b/public/assets/kindeditor/plugins/emoticons/images/129.gif
new file mode 100644
index 000000000..ffd7c6ba3
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/129.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/13.gif b/public/assets/kindeditor/plugins/emoticons/images/13.gif
new file mode 100644
index 000000000..34753001e
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/13.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/130.gif b/public/assets/kindeditor/plugins/emoticons/images/130.gif
new file mode 100644
index 000000000..d828e3da1
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/130.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/131.gif b/public/assets/kindeditor/plugins/emoticons/images/131.gif
new file mode 100644
index 000000000..dcb096f0d
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/131.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/132.gif b/public/assets/kindeditor/plugins/emoticons/images/132.gif
new file mode 100644
index 000000000..1b272a690
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/132.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/133.gif b/public/assets/kindeditor/plugins/emoticons/images/133.gif
new file mode 100644
index 000000000..0d0e86426
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/133.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/134.gif b/public/assets/kindeditor/plugins/emoticons/images/134.gif
new file mode 100644
index 000000000..cf48356e3
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/134.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/14.gif b/public/assets/kindeditor/plugins/emoticons/images/14.gif
new file mode 100644
index 000000000..6a788f8be
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/14.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/15.gif b/public/assets/kindeditor/plugins/emoticons/images/15.gif
new file mode 100644
index 000000000..debab8ed0
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/15.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/16.gif b/public/assets/kindeditor/plugins/emoticons/images/16.gif
new file mode 100644
index 000000000..ed5d29f42
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/16.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/17.gif b/public/assets/kindeditor/plugins/emoticons/images/17.gif
new file mode 100644
index 000000000..85886fef9
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/17.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/18.gif b/public/assets/kindeditor/plugins/emoticons/images/18.gif
new file mode 100644
index 000000000..b6af2189c
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/18.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/19.gif b/public/assets/kindeditor/plugins/emoticons/images/19.gif
new file mode 100644
index 000000000..e045ff2af
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/19.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/2.gif b/public/assets/kindeditor/plugins/emoticons/images/2.gif
new file mode 100644
index 000000000..40cfda436
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/2.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/20.gif b/public/assets/kindeditor/plugins/emoticons/images/20.gif
new file mode 100644
index 000000000..efd650f55
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/20.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/21.gif b/public/assets/kindeditor/plugins/emoticons/images/21.gif
new file mode 100644
index 000000000..cb8cf6d2a
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/21.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/22.gif b/public/assets/kindeditor/plugins/emoticons/images/22.gif
new file mode 100644
index 000000000..96b04df86
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/22.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/23.gif b/public/assets/kindeditor/plugins/emoticons/images/23.gif
new file mode 100644
index 000000000..96516b8d9
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/23.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/24.gif b/public/assets/kindeditor/plugins/emoticons/images/24.gif
new file mode 100644
index 000000000..5f925c7bc
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/24.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/25.gif b/public/assets/kindeditor/plugins/emoticons/images/25.gif
new file mode 100644
index 000000000..97f8b1afa
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/25.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/26.gif b/public/assets/kindeditor/plugins/emoticons/images/26.gif
new file mode 100644
index 000000000..a7cded731
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/26.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/27.gif b/public/assets/kindeditor/plugins/emoticons/images/27.gif
new file mode 100644
index 000000000..bb468901e
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/27.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/28.gif b/public/assets/kindeditor/plugins/emoticons/images/28.gif
new file mode 100644
index 000000000..f59dd5825
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/28.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/29.gif b/public/assets/kindeditor/plugins/emoticons/images/29.gif
new file mode 100644
index 000000000..3c5227e8e
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/29.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/3.gif b/public/assets/kindeditor/plugins/emoticons/images/3.gif
new file mode 100644
index 000000000..6d6f76299
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/3.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/30.gif b/public/assets/kindeditor/plugins/emoticons/images/30.gif
new file mode 100644
index 000000000..e24a1801c
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/30.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/31.gif b/public/assets/kindeditor/plugins/emoticons/images/31.gif
new file mode 100644
index 000000000..073e743ce
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/31.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/32.gif b/public/assets/kindeditor/plugins/emoticons/images/32.gif
new file mode 100644
index 000000000..772eff23e
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/32.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/33.gif b/public/assets/kindeditor/plugins/emoticons/images/33.gif
new file mode 100644
index 000000000..217c1c581
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/33.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/34.gif b/public/assets/kindeditor/plugins/emoticons/images/34.gif
new file mode 100644
index 000000000..e9d42131a
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/34.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/35.gif b/public/assets/kindeditor/plugins/emoticons/images/35.gif
new file mode 100644
index 000000000..d6da2c33a
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/35.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/36.gif b/public/assets/kindeditor/plugins/emoticons/images/36.gif
new file mode 100644
index 000000000..c1e6ac913
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/36.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/37.gif b/public/assets/kindeditor/plugins/emoticons/images/37.gif
new file mode 100644
index 000000000..92efec6ae
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/37.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/38.gif b/public/assets/kindeditor/plugins/emoticons/images/38.gif
new file mode 100644
index 000000000..489f0f948
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/38.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/39.gif b/public/assets/kindeditor/plugins/emoticons/images/39.gif
new file mode 100644
index 000000000..734f6d82e
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/39.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/4.gif b/public/assets/kindeditor/plugins/emoticons/images/4.gif
new file mode 100644
index 000000000..6ccdaa2c9
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/4.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/40.gif b/public/assets/kindeditor/plugins/emoticons/images/40.gif
new file mode 100644
index 000000000..24a8eb691
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/40.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/41.gif b/public/assets/kindeditor/plugins/emoticons/images/41.gif
new file mode 100644
index 000000000..99139e1d1
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/41.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/42.gif b/public/assets/kindeditor/plugins/emoticons/images/42.gif
new file mode 100644
index 000000000..f60897e40
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/42.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/43.gif b/public/assets/kindeditor/plugins/emoticons/images/43.gif
new file mode 100644
index 000000000..435049100
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/43.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/44.gif b/public/assets/kindeditor/plugins/emoticons/images/44.gif
new file mode 100644
index 000000000..650d3dd84
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/44.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/45.gif b/public/assets/kindeditor/plugins/emoticons/images/45.gif
new file mode 100644
index 000000000..5c8e07181
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/45.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/46.gif b/public/assets/kindeditor/plugins/emoticons/images/46.gif
new file mode 100644
index 000000000..f3cb0742d
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/46.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/47.gif b/public/assets/kindeditor/plugins/emoticons/images/47.gif
new file mode 100644
index 000000000..5b3057ab7
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/47.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/48.gif b/public/assets/kindeditor/plugins/emoticons/images/48.gif
new file mode 100644
index 000000000..27a30c15c
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/48.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/49.gif b/public/assets/kindeditor/plugins/emoticons/images/49.gif
new file mode 100644
index 000000000..dcfa48af0
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/49.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/5.gif b/public/assets/kindeditor/plugins/emoticons/images/5.gif
new file mode 100644
index 000000000..ab0b81ba4
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/5.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/50.gif b/public/assets/kindeditor/plugins/emoticons/images/50.gif
new file mode 100644
index 000000000..029cf0fea
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/50.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/51.gif b/public/assets/kindeditor/plugins/emoticons/images/51.gif
new file mode 100644
index 000000000..69f183f04
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/51.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/52.gif b/public/assets/kindeditor/plugins/emoticons/images/52.gif
new file mode 100644
index 000000000..d41e8aab1
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/52.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/53.gif b/public/assets/kindeditor/plugins/emoticons/images/53.gif
new file mode 100644
index 000000000..56352dde4
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/53.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/54.gif b/public/assets/kindeditor/plugins/emoticons/images/54.gif
new file mode 100644
index 000000000..b28d8481e
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/54.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/55.gif b/public/assets/kindeditor/plugins/emoticons/images/55.gif
new file mode 100644
index 000000000..e18da84c6
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/55.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/56.gif b/public/assets/kindeditor/plugins/emoticons/images/56.gif
new file mode 100644
index 000000000..edf96f0a6
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/56.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/57.gif b/public/assets/kindeditor/plugins/emoticons/images/57.gif
new file mode 100644
index 000000000..3f0e2b9af
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/57.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/58.gif b/public/assets/kindeditor/plugins/emoticons/images/58.gif
new file mode 100644
index 000000000..47b1aaa34
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/58.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/59.gif b/public/assets/kindeditor/plugins/emoticons/images/59.gif
new file mode 100644
index 000000000..918288b00
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/59.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/6.gif b/public/assets/kindeditor/plugins/emoticons/images/6.gif
new file mode 100644
index 000000000..ceab12242
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/6.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/60.gif b/public/assets/kindeditor/plugins/emoticons/images/60.gif
new file mode 100644
index 000000000..66d21136d
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/60.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/61.gif b/public/assets/kindeditor/plugins/emoticons/images/61.gif
new file mode 100644
index 000000000..034933ec3
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/61.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/62.gif b/public/assets/kindeditor/plugins/emoticons/images/62.gif
new file mode 100644
index 000000000..8d5c4fd39
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/62.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/63.gif b/public/assets/kindeditor/plugins/emoticons/images/63.gif
new file mode 100644
index 000000000..d58fcf671
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/63.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/64.gif b/public/assets/kindeditor/plugins/emoticons/images/64.gif
new file mode 100644
index 000000000..c4e00bdfd
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/64.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/65.gif b/public/assets/kindeditor/plugins/emoticons/images/65.gif
new file mode 100644
index 000000000..da23bfaac
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/65.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/66.gif b/public/assets/kindeditor/plugins/emoticons/images/66.gif
new file mode 100644
index 000000000..310ec65f1
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/66.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/67.gif b/public/assets/kindeditor/plugins/emoticons/images/67.gif
new file mode 100644
index 000000000..51761ba45
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/67.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/68.gif b/public/assets/kindeditor/plugins/emoticons/images/68.gif
new file mode 100644
index 000000000..345cb4391
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/68.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/69.gif b/public/assets/kindeditor/plugins/emoticons/images/69.gif
new file mode 100644
index 000000000..e0f28a073
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/69.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/7.gif b/public/assets/kindeditor/plugins/emoticons/images/7.gif
new file mode 100644
index 000000000..2f4539998
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/7.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/70.gif b/public/assets/kindeditor/plugins/emoticons/images/70.gif
new file mode 100644
index 000000000..24284cf39
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/70.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/71.gif b/public/assets/kindeditor/plugins/emoticons/images/71.gif
new file mode 100644
index 000000000..a0ccf2edf
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/71.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/72.gif b/public/assets/kindeditor/plugins/emoticons/images/72.gif
new file mode 100644
index 000000000..7e113eead
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/72.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/73.gif b/public/assets/kindeditor/plugins/emoticons/images/73.gif
new file mode 100644
index 000000000..c0293c3ab
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/73.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/74.gif b/public/assets/kindeditor/plugins/emoticons/images/74.gif
new file mode 100644
index 000000000..1c52bde9c
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/74.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/75.gif b/public/assets/kindeditor/plugins/emoticons/images/75.gif
new file mode 100644
index 000000000..9cb9aa796
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/75.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/76.gif b/public/assets/kindeditor/plugins/emoticons/images/76.gif
new file mode 100644
index 000000000..27019f8ff
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/76.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/77.gif b/public/assets/kindeditor/plugins/emoticons/images/77.gif
new file mode 100644
index 000000000..8f882f531
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/77.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/78.gif b/public/assets/kindeditor/plugins/emoticons/images/78.gif
new file mode 100644
index 000000000..d0d085604
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/78.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/79.gif b/public/assets/kindeditor/plugins/emoticons/images/79.gif
new file mode 100644
index 000000000..61652a716
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/79.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/8.gif b/public/assets/kindeditor/plugins/emoticons/images/8.gif
new file mode 100644
index 000000000..f6c883447
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/8.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/80.gif b/public/assets/kindeditor/plugins/emoticons/images/80.gif
new file mode 100644
index 000000000..9a779364b
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/80.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/81.gif b/public/assets/kindeditor/plugins/emoticons/images/81.gif
new file mode 100644
index 000000000..2329101a7
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/81.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/82.gif b/public/assets/kindeditor/plugins/emoticons/images/82.gif
new file mode 100644
index 000000000..644748a96
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/82.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/83.gif b/public/assets/kindeditor/plugins/emoticons/images/83.gif
new file mode 100644
index 000000000..fbf275ba5
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/83.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/84.gif b/public/assets/kindeditor/plugins/emoticons/images/84.gif
new file mode 100644
index 000000000..076f0c65c
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/84.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/85.gif b/public/assets/kindeditor/plugins/emoticons/images/85.gif
new file mode 100644
index 000000000..d254af442
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/85.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/86.gif b/public/assets/kindeditor/plugins/emoticons/images/86.gif
new file mode 100644
index 000000000..8f09d336a
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/86.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/87.gif b/public/assets/kindeditor/plugins/emoticons/images/87.gif
new file mode 100644
index 000000000..df70756f0
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/87.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/88.gif b/public/assets/kindeditor/plugins/emoticons/images/88.gif
new file mode 100644
index 000000000..4d8b15e7e
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/88.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/89.gif b/public/assets/kindeditor/plugins/emoticons/images/89.gif
new file mode 100644
index 000000000..05726dc4a
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/89.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/9.gif b/public/assets/kindeditor/plugins/emoticons/images/9.gif
new file mode 100644
index 000000000..c2d845075
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/9.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/90.gif b/public/assets/kindeditor/plugins/emoticons/images/90.gif
new file mode 100644
index 000000000..adaf20e8b
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/90.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/91.gif b/public/assets/kindeditor/plugins/emoticons/images/91.gif
new file mode 100644
index 000000000..608d0ad87
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/91.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/92.gif b/public/assets/kindeditor/plugins/emoticons/images/92.gif
new file mode 100644
index 000000000..b909e16a8
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/92.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/93.gif b/public/assets/kindeditor/plugins/emoticons/images/93.gif
new file mode 100644
index 000000000..7f71a8c94
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/93.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/94.gif b/public/assets/kindeditor/plugins/emoticons/images/94.gif
new file mode 100644
index 000000000..4f26d7d73
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/94.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/95.gif b/public/assets/kindeditor/plugins/emoticons/images/95.gif
new file mode 100644
index 000000000..5ef6d3823
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/95.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/96.gif b/public/assets/kindeditor/plugins/emoticons/images/96.gif
new file mode 100644
index 000000000..2b709e15b
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/96.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/97.gif b/public/assets/kindeditor/plugins/emoticons/images/97.gif
new file mode 100644
index 000000000..cf29be87c
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/97.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/98.gif b/public/assets/kindeditor/plugins/emoticons/images/98.gif
new file mode 100644
index 000000000..c70e7d339
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/98.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/99.gif b/public/assets/kindeditor/plugins/emoticons/images/99.gif
new file mode 100644
index 000000000..05c18635d
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/99.gif differ
diff --git a/public/assets/kindeditor/plugins/emoticons/images/static.gif b/public/assets/kindeditor/plugins/emoticons/images/static.gif
new file mode 100644
index 000000000..b8c444b5a
Binary files /dev/null and b/public/assets/kindeditor/plugins/emoticons/images/static.gif differ
diff --git a/public/assets/kindeditor/plugins/filemanager/filemanager.js b/public/assets/kindeditor/plugins/filemanager/filemanager.js
new file mode 100644
index 000000000..fd899af56
--- /dev/null
+++ b/public/assets/kindeditor/plugins/filemanager/filemanager.js
@@ -0,0 +1,189 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('filemanager', function(K) {
+	var self = this, name = 'filemanager',
+		fileManagerJson = K.undef(self.fileManagerJson, self.basePath + 'php/file_manager_json.php'),
+		imgPath = self.pluginsPath + name + '/images/',
+		lang = self.lang(name + '.');
+	function makeFileTitle(filename, filesize, datetime) {
+		return filename + ' (' + Math.ceil(filesize / 1024) + 'KB, ' + datetime + ')';
+	}
+	function bindTitle(el, data) {
+		if (data.is_dir) {
+			el.attr('title', data.filename);
+		} else {
+			el.attr('title', makeFileTitle(data.filename, data.filesize, data.datetime));
+		}
+	}
+	self.plugin.filemanagerDialog = function(options) {
+		var width = K.undef(options.width, 650),
+			height = K.undef(options.height, 510),
+			dirName = K.undef(options.dirName, ''),
+			viewType = K.undef(options.viewType, 'VIEW').toUpperCase(), // "LIST" or "VIEW"
+			clickFn = options.clickFn;
+		var html = [
+			'<div style="padding:10px 20px;">',
+			// header start
+			'<div class="ke-plugin-filemanager-header">',
+			// left start
+			'<div class="ke-left">',
+			'<img class="ke-inline-block" name="moveupImg" src="' + imgPath + 'go-up.gif" width="16" height="16" border="0" alt="" /> ',
+			'<a class="ke-inline-block" name="moveupLink" href="javascript:;">' + lang.moveup + '</a>',
+			'</div>',
+			// right start
+			'<div class="ke-right">',
+			lang.viewType + ' <select class="ke-inline-block" name="viewType">',
+			'<option value="VIEW">' + lang.viewImage + '</option>',
+			'<option value="LIST">' + lang.listImage + '</option>',
+			'</select> ',
+			lang.orderType + ' <select class="ke-inline-block" name="orderType">',
+			'<option value="NAME">' + lang.fileName + '</option>',
+			'<option value="SIZE">' + lang.fileSize + '</option>',
+			'<option value="TYPE">' + lang.fileType + '</option>',
+			'</select>',
+			'</div>',
+			'<div class="ke-clearfix"></div>',
+			'</div>',
+			// body start
+			'<div class="ke-plugin-filemanager-body"></div>',
+			'</div>'
+		].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : width,
+			height : height,
+			title : self.lang(name),
+			body : html
+		}),
+		div = dialog.div,
+		bodyDiv = K('.ke-plugin-filemanager-body', div),
+		moveupImg = K('[name="moveupImg"]', div),
+		moveupLink = K('[name="moveupLink"]', div),
+		viewServerBtn = K('[name="viewServer"]', div),
+		viewTypeBox = K('[name="viewType"]', div),
+		orderTypeBox = K('[name="orderType"]', div);
+		function reloadPage(path, order, func) {
+			var param = 'path=' + path + '&order=' + order + '&dir=' + dirName;
+			dialog.showLoading(self.lang('ajaxLoading'));
+			K.ajax(K.addParam(fileManagerJson, param + '&' + new Date().getTime()), function(data) {
+				dialog.hideLoading();
+				func(data);
+			});
+		}
+		var elList = [];
+		function bindEvent(el, result, data, createFunc) {
+			var fileUrl = K.formatUrl(result.current_url + data.filename, 'absolute'),
+				dirPath = encodeURIComponent(result.current_dir_path + data.filename + '/');
+			if (data.is_dir) {
+				el.click(function(e) {
+					reloadPage(dirPath, orderTypeBox.val(), createFunc);
+				});
+			} else if (data.is_photo) {
+				el.click(function(e) {
+					clickFn.call(this, fileUrl, data.filename);
+				});
+			} else {
+				el.click(function(e) {
+					clickFn.call(this, fileUrl, data.filename);
+				});
+			}
+			elList.push(el);
+		}
+		function createCommon(result, createFunc) {
+			// remove events
+			K.each(elList, function() {
+				this.unbind();
+			});
+			moveupLink.unbind();
+			viewTypeBox.unbind();
+			orderTypeBox.unbind();
+			// add events
+			if (result.current_dir_path) {
+				moveupLink.click(function(e) {
+					reloadPage(result.moveup_dir_path, orderTypeBox.val(), createFunc);
+				});
+			}
+			function changeFunc() {
+				if (viewTypeBox.val() == 'VIEW') {
+					reloadPage(result.current_dir_path, orderTypeBox.val(), createView);
+				} else {
+					reloadPage(result.current_dir_path, orderTypeBox.val(), createList);
+				}
+			}
+			viewTypeBox.change(changeFunc);
+			orderTypeBox.change(changeFunc);
+			bodyDiv.html('');
+		}
+		function createList(result) {
+			createCommon(result, createList);
+			var table = document.createElement('table');
+			table.className = 'ke-table';
+			table.cellPadding = 0;
+			table.cellSpacing = 0;
+			table.border = 0;
+			bodyDiv.append(table);
+			var fileList = result.file_list;
+			for (var i = 0, len = fileList.length; i < len; i++) {
+				var data = fileList[i], row = K(table.insertRow(i));
+				row.mouseover(function(e) {
+					K(this).addClass('ke-on');
+				})
+				.mouseout(function(e) {
+					K(this).removeClass('ke-on');
+				});
+				var iconUrl = imgPath + (data.is_dir ? 'folder-16.gif' : 'file-16.gif'),
+					img = K('<img src="' + iconUrl + '" width="16" height="16" alt="' + data.filename + '" align="absmiddle" />'),
+					cell0 = K(row[0].insertCell(0)).addClass('ke-cell ke-name').append(img).append(document.createTextNode(' ' + data.filename));
+				if (!data.is_dir || data.has_file) {
+					row.css('cursor', 'pointer');
+					cell0.attr('title', data.filename);
+					bindEvent(cell0, result, data, createList);
+				} else {
+					cell0.attr('title', lang.emptyFolder);
+				}
+				K(row[0].insertCell(1)).addClass('ke-cell ke-size').html(data.is_dir ? '-' : Math.ceil(data.filesize / 1024) + 'KB');
+				K(row[0].insertCell(2)).addClass('ke-cell ke-datetime').html(data.datetime);
+			}
+		}
+		function createView(result) {
+			createCommon(result, createView);
+			var fileList = result.file_list;
+			for (var i = 0, len = fileList.length; i < len; i++) {
+				var data = fileList[i],
+					div = K('<div class="ke-inline-block ke-item"></div>');
+				bodyDiv.append(div);
+				var photoDiv = K('<div class="ke-inline-block ke-photo"></div>')
+					.mouseover(function(e) {
+						K(this).addClass('ke-on');
+					})
+					.mouseout(function(e) {
+						K(this).removeClass('ke-on');
+					});
+				div.append(photoDiv);
+				var fileUrl = result.current_url + data.filename,
+					iconUrl = data.is_dir ? imgPath + 'folder-64.gif' : (data.is_photo ? fileUrl : imgPath + 'file-64.gif');
+				var img = K('<img src="' + iconUrl + '" width="80" height="80" alt="' + data.filename + '" />');
+				if (!data.is_dir || data.has_file) {
+					photoDiv.css('cursor', 'pointer');
+					bindTitle(photoDiv, data);
+					bindEvent(photoDiv, result, data, createView);
+				} else {
+					photoDiv.attr('title', lang.emptyFolder);
+				}
+				photoDiv.append(img);
+				div.append('<div class="ke-name" title="' + data.filename + '">' + data.filename + '</div>');
+			}
+		}
+		viewTypeBox.val(viewType);
+		reloadPage('', orderTypeBox.val(), viewType == 'VIEW' ? createView : createList);
+		return dialog;
+	}
+
+});
diff --git a/public/assets/kindeditor/plugins/filemanager/images/file-16.gif b/public/assets/kindeditor/plugins/filemanager/images/file-16.gif
new file mode 100644
index 000000000..2cf6e47ed
Binary files /dev/null and b/public/assets/kindeditor/plugins/filemanager/images/file-16.gif differ
diff --git a/public/assets/kindeditor/plugins/filemanager/images/file-64.gif b/public/assets/kindeditor/plugins/filemanager/images/file-64.gif
new file mode 100644
index 000000000..2e211da0e
Binary files /dev/null and b/public/assets/kindeditor/plugins/filemanager/images/file-64.gif differ
diff --git a/public/assets/kindeditor/plugins/filemanager/images/folder-16.gif b/public/assets/kindeditor/plugins/filemanager/images/folder-16.gif
new file mode 100644
index 000000000..850b5a350
Binary files /dev/null and b/public/assets/kindeditor/plugins/filemanager/images/folder-16.gif differ
diff --git a/public/assets/kindeditor/plugins/filemanager/images/folder-64.gif b/public/assets/kindeditor/plugins/filemanager/images/folder-64.gif
new file mode 100644
index 000000000..e8a1b09c0
Binary files /dev/null and b/public/assets/kindeditor/plugins/filemanager/images/folder-64.gif differ
diff --git a/public/assets/kindeditor/plugins/filemanager/images/go-up.gif b/public/assets/kindeditor/plugins/filemanager/images/go-up.gif
new file mode 100644
index 000000000..92ae23d76
Binary files /dev/null and b/public/assets/kindeditor/plugins/filemanager/images/go-up.gif differ
diff --git a/public/assets/kindeditor/plugins/flash/flash.js b/public/assets/kindeditor/plugins/flash/flash.js
new file mode 100644
index 000000000..d5d465e16
--- /dev/null
+++ b/public/assets/kindeditor/plugins/flash/flash.js
@@ -0,0 +1,161 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('flash', function(K) {
+	var self = this, name = 'flash', lang = self.lang(name + '.'),
+		allowFlashUpload = K.undef(self.allowFlashUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
+	self.plugin.flash = {
+		edit : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//url
+				'<div class="ke-dialog-row">',
+				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<span class="ke-button-common ke-button-outer">',
+				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+				'</span>',
+				'</div>',
+				//width
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:60px;">' + lang.width + '</label>',
+				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" /> ',
+				'</div>',
+				//height
+				'<div class="ke-dialog-row">',
+				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
+				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" /> ',
+				'</div>',
+				'</div>'
+			].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var url = K.trim(urlBox.val()),
+							width = widthBox.val(),
+							height = heightBox.val();
+						if (url == 'http://' || K.invalidUrl(url)) {
+							alert(self.lang('invalidUrl'));
+							urlBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
+								src : url,
+								type : K.mediaType('.swf'),
+								width : width,
+								height : height,
+								quality : 'high'
+							});
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('[name="width"]', div),
+			heightBox = K('[name="height"]', div);
+			urlBox.val('http://');
+
+			if (allowFlashUpload) {
+				var uploadbutton = K.uploadbutton({
+					button : K('.ke-upload-button', div)[0],
+					fieldName : filePostName,
+					extraParams : extraParams,
+					url : K.addParam(uploadJson, 'dir=flash'),
+					afterUpload : function(data) {
+						dialog.hideLoading();
+						if (data.error === 0) {
+							var url = data.url;
+							if (formatUploadUrl) {
+								url = K.formatUrl(url, 'absolute');
+							}
+							urlBox.val(url);
+							if (self.afterUpload) {
+								self.afterUpload.call(self, url, data, name);
+							}
+							alert(self.lang('uploadSuccess'));
+						} else {
+							alert(data.message);
+						}
+					},
+					afterError : function(html) {
+						dialog.hideLoading();
+						self.errorDialog(html);
+					}
+				});
+				uploadbutton.fileBox.change(function(e) {
+					dialog.showLoading(self.lang('uploadLoading'));
+					uploadbutton.submit();
+				});
+			} else {
+				K('.ke-upload-button', div).hide();
+			}
+
+			if (allowFileManager) {
+				viewServerBtn.click(function(e) {
+					self.loadPlugin('filemanager', function() {
+						self.plugin.filemanagerDialog({
+							viewType : 'LIST',
+							dirName : 'flash',
+							clickFn : function(url, title) {
+								if (self.dialogs.length > 1) {
+									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
+									self.hideDialog();
+								}
+							}
+						});
+					});
+				});
+			} else {
+				viewServerBtn.hide();
+			}
+
+			var img = self.plugin.getSelectedFlash();
+			if (img) {
+				var attrs = K.mediaAttrs(img.attr('data-ke-tag'));
+				urlBox.val(attrs.src);
+				widthBox.val(K.removeUnit(img.css('width')) || attrs.width || 0);
+				heightBox.val(K.removeUnit(img.css('height')) || attrs.height || 0);
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedFlash().remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.flash.edit);
+});
diff --git a/public/assets/kindeditor/plugins/image/image.js b/public/assets/kindeditor/plugins/image/image.js
new file mode 100644
index 000000000..fd7f5a501
--- /dev/null
+++ b/public/assets/kindeditor/plugins/image/image.js
@@ -0,0 +1,372 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('image', function(K) {
+	var self = this, name = 'image',
+		allowImageUpload = K.undef(self.allowImageUpload, true),
+		allowImageRemote = K.undef(self.allowImageRemote, true),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		imageTabIndex = K.undef(self.imageTabIndex, 0),
+		imgPath = self.pluginsPath + 'image/images/',
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		fillDescAfterUploadImage = K.undef(self.fillDescAfterUploadImage, false),
+		lang = self.lang(name + '.');
+
+	self.plugin.imageDialog = function(options) {
+		var imageUrl = options.imageUrl,
+			imageWidth = K.undef(options.imageWidth, ''),
+			imageHeight = K.undef(options.imageHeight, ''),
+			imageTitle = K.undef(options.imageTitle, ''),
+			imageAlign = K.undef(options.imageAlign, ''),
+			showRemote = K.undef(options.showRemote, true),
+			showLocal = K.undef(options.showLocal, true),
+			tabIndex = K.undef(options.tabIndex, 0),
+			clickFn = options.clickFn;
+		var target = 'kindeditor_upload_iframe_' + new Date().getTime();
+		var hiddenElements = [];
+		for(var k in extraParams){
+			hiddenElements.push('<input type="hidden" name="' + k + '" value="' + extraParams[k] + '" />');
+		}
+		var html = [
+			'<div style="padding:20px;">',
+			//tabs
+			'<div class="tabs"></div>',
+			//remote image - start
+			'<div class="tab1" style="display:none;">',
+			//url
+			'<div class="ke-dialog-row">',
+			'<label for="remoteUrl" style="width:60px;">' + lang.remoteUrl + '</label>',
+			'<input type="text" id="remoteUrl" class="ke-input-text" name="url" value="" style="width:200px;" /> &nbsp;',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+			'</span>',
+			'</div>',
+			//size
+			'<div class="ke-dialog-row">',
+			'<label for="remoteWidth" style="width:60px;">' + lang.size + '</label>',
+			lang.width + ' <input type="text" id="remoteWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> ',
+			lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> ',
+			'<img class="ke-refresh-btn" src="' + imgPath + 'refresh.png" width="16" height="16" alt="" style="cursor:pointer;" title="' + lang.resetSize + '" />',
+			'</div>',
+			//align
+			'<div class="ke-dialog-row">',
+			'<label style="width:60px;">' + lang.align + '</label>',
+			'<input type="radio" name="align" class="ke-inline-block" value="" checked="checked" /> <img name="defaultImg" src="' + imgPath + 'align_top.gif" width="23" height="25" alt="" />',
+			' <input type="radio" name="align" class="ke-inline-block" value="left" /> <img name="leftImg" src="' + imgPath + 'align_left.gif" width="23" height="25" alt="" />',
+			' <input type="radio" name="align" class="ke-inline-block" value="right" /> <img name="rightImg" src="' + imgPath + 'align_right.gif" width="23" height="25" alt="" />',
+			'</div>',
+			//title
+			'<div class="ke-dialog-row">',
+			'<label for="remoteTitle" style="width:60px;">' + lang.imgTitle + '</label>',
+			'<input type="text" id="remoteTitle" class="ke-input-text" name="title" value="" style="width:200px;" />',
+			'</div>',
+			'</div>',
+			//remote image - end
+			//local upload - start
+			'<div class="tab2" style="display:none;">',
+			'<iframe name="' + target + '" style="display:none;"></iframe>',
+			'<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="' + target + '" action="' + K.addParam(uploadJson, 'dir=image') + '">',
+			//file
+			'<div class="ke-dialog-row">',
+			hiddenElements.join(''),
+			'<label style="width:60px;">' + lang.localUrl + '</label>',
+			'<input type="text" name="localUrl" class="ke-input-text" tabindex="-1" style="width:200px;" readonly="true" /> &nbsp;',
+			'<input type="button" class="ke-upload-button" value="' + lang.upload + '" />',
+			'</div>',
+			'</form>',
+			'</div>',
+			//local upload - end
+			'</div>'
+		].join('');
+		var dialogWidth = showLocal || allowFileManager ? 450 : 400,
+			dialogHeight = showLocal && showRemote ? 300 : 250;
+		var dialog = self.createDialog({
+			name : name,
+			width : dialogWidth,
+			height : dialogHeight,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					// Bugfix: http://code.google.com/p/kindeditor/issues/detail?id=319
+					if (dialog.isLoading) {
+						return;
+					}
+					// insert local image
+					if (showLocal && showRemote && tabs && tabs.selectedIndex === 1 || !showRemote) {
+						if (uploadbutton.fileBox.val() == '') {
+							alert(self.lang('pleaseSelectFile'));
+							return;
+						}
+						dialog.showLoading(self.lang('uploadLoading'));
+						uploadbutton.submit();
+						localUrlBox.val('');
+						return;
+					}
+					// insert remote image
+					var url = K.trim(urlBox.val()),
+						width = widthBox.val(),
+						height = heightBox.val(),
+						title = titleBox.val(),
+						align = '';
+					alignBox.each(function() {
+						if (this.checked) {
+							align = this.value;
+							return false;
+						}
+					});
+					if (url == 'http://' || K.invalidUrl(url)) {
+						alert(self.lang('invalidUrl'));
+						urlBox[0].focus();
+						return;
+					}
+					if (!/^\d*$/.test(width)) {
+						alert(self.lang('invalidWidth'));
+						widthBox[0].focus();
+						return;
+					}
+					if (!/^\d*$/.test(height)) {
+						alert(self.lang('invalidHeight'));
+						heightBox[0].focus();
+						return;
+					}
+					clickFn.call(self, url, title, width, height, 0, align);
+				}
+			},
+			beforeRemove : function() {
+				viewServerBtn.unbind();
+				widthBox.unbind();
+				heightBox.unbind();
+				refreshBtn.unbind();
+			}
+		}),
+		div = dialog.div;
+
+		var urlBox = K('[name="url"]', div),
+			localUrlBox = K('[name="localUrl"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('.tab1 [name="width"]', div),
+			heightBox = K('.tab1 [name="height"]', div),
+			refreshBtn = K('.ke-refresh-btn', div),
+			titleBox = K('.tab1 [name="title"]', div),
+			alignBox = K('.tab1 [name="align"]', div);
+
+		var tabs;
+		if (showRemote && showLocal) {
+			tabs = K.tabs({
+				src : K('.tabs', div),
+				afterSelect : function(i) {}
+			});
+			tabs.add({
+				title : lang.remoteImage,
+				panel : K('.tab1', div)
+			});
+			tabs.add({
+				title : lang.localImage,
+				panel : K('.tab2', div)
+			});
+			tabs.select(tabIndex);
+		} else if (showRemote) {
+			K('.tab1', div).show();
+		} else if (showLocal) {
+			K('.tab2', div).show();
+		}
+
+		var uploadbutton = K.uploadbutton({
+			button : K('.ke-upload-button', div)[0],
+			fieldName : filePostName,
+			form : K('.ke-form', div),
+			target : target,
+			width: 60,
+			afterUpload : function(data) {
+				dialog.hideLoading();
+				if (data.error === 0) {
+					var url = data.url;
+					if (formatUploadUrl) {
+						url = K.formatUrl(url, 'absolute');
+					}
+					if (self.afterUpload) {
+						self.afterUpload.call(self, url, data, name);
+					}
+					if (!fillDescAfterUploadImage) {
+						clickFn.call(self, url, data.title, data.width, data.height, data.border, data.align);
+					} else {
+						K(".ke-dialog-row #remoteUrl", div).val(url);
+						K(".ke-tabs-li", div)[0].click();
+						K(".ke-refresh-btn", div).click();
+					}
+				} else {
+					alert(data.message);
+				}
+			},
+			afterError : function(html) {
+				dialog.hideLoading();
+				self.errorDialog(html);
+			}
+		});
+		uploadbutton.fileBox.change(function(e) {
+			//localUrlBox.val(uploadbutton.fileBox.val());
+                if (dialog.isLoading) {
+                    return;
+                }
+                // insert local image
+                if (showLocal && showRemote && tabs && tabs.selectedIndex === 1 || !showRemote) {
+                    if (uploadbutton.fileBox.val() == '') {
+                        alert(self.lang('pleaseSelectFile'));
+                        return;
+                    }
+                    dialog.showLoading(self.lang('uploadLoading'));
+                    uploadbutton.submit();
+                    localUrlBox.val('');
+                    return;
+                }
+                // insert remote image
+                var url = K.trim(urlBox.val()),
+                    width = widthBox.val(),
+                    height = heightBox.val(),
+                    title = titleBox.val(),
+                    align = '';
+                alignBox.each(function() {
+                    if (this.checked) {
+                        align = this.value;
+                        return false;
+                    }
+                });
+                if (url == 'http://' || K.invalidUrl(url)) {
+                    alert(self.lang('invalidUrl'));
+                    urlBox[0].focus();
+                    return;
+                }
+                if (!/^\d*$/.test(width)) {
+                    alert(self.lang('invalidWidth'));
+                    widthBox[0].focus();
+                    return;
+                }
+                if (!/^\d*$/.test(height)) {
+                    alert(self.lang('invalidHeight'));
+                    heightBox[0].focus();
+                    return;
+                }
+                clickFn.call(self, url, title, width, height, 0, align);
+
+
+		});
+		if (allowFileManager) {
+			viewServerBtn.click(function(e) {
+				self.loadPlugin('filemanager', function() {
+					self.plugin.filemanagerDialog({
+						viewType : 'VIEW',
+						dirName : 'image',
+						clickFn : function(url, title) {
+							if (self.dialogs.length > 1) {
+								K('[name="url"]', div).val(url);
+								if (self.afterSelectFile) {
+									self.afterSelectFile.call(self, url);
+								}
+								self.hideDialog();
+							}
+						}
+					});
+				});
+			});
+		} else {
+			viewServerBtn.hide();
+		}
+		var originalWidth = 0, originalHeight = 0;
+		function setSize(width, height) {
+			widthBox.val(width);
+			heightBox.val(height);
+			originalWidth = width;
+			originalHeight = height;
+		}
+		refreshBtn.click(function(e) {
+			var tempImg = K('<img src="' + urlBox.val() + '" />', document).css({
+				position : 'absolute',
+				visibility : 'hidden',
+				top : 0,
+				left : '-1000px'
+			});
+			tempImg.bind('load', function() {
+				setSize(tempImg.width(), tempImg.height());
+				tempImg.remove();
+			});
+			K(document.body).append(tempImg);
+		});
+		widthBox.change(function(e) {
+			if (originalWidth > 0) {
+				heightBox.val(Math.round(originalHeight / originalWidth * parseInt(this.value, 10)));
+			}
+		});
+		heightBox.change(function(e) {
+			if (originalHeight > 0) {
+				widthBox.val(Math.round(originalWidth / originalHeight * parseInt(this.value, 10)));
+			}
+		});
+		urlBox.val(options.imageUrl);
+		setSize(options.imageWidth, options.imageHeight);
+		titleBox.val(options.imageTitle);
+		alignBox.each(function() {
+			if (this.value === options.imageAlign) {
+				this.checked = true;
+				return false;
+			}
+		});
+		if (showRemote && tabIndex === 0) {
+			urlBox[0].focus();
+			urlBox[0].select();
+		}
+		return dialog;
+	};
+	self.plugin.image = {
+		edit : function() {
+			var img = self.plugin.getSelectedImage();
+			self.plugin.imageDialog({
+				imageUrl : img ? img.attr('data-ke-src') : 'http://',
+				imageWidth : img ? img.width() : '',
+				imageHeight : img ? img.height() : '',
+				imageTitle : img ? img.attr('title') : '',
+				imageAlign : img ? img.attr('align') : '',
+				showRemote : allowImageRemote,
+				showLocal : allowImageUpload,
+				tabIndex: img ? 0 : imageTabIndex,
+				clickFn : function(url, title, width, height, border, align) {
+					if (img) {
+						img.attr('src', url);
+						img.attr('data-ke-src', url);
+						img.attr('width', width);
+						img.attr('height', height);
+						img.attr('title', title);
+						img.attr('align', align);
+						img.attr('alt', title);
+					} else {
+						self.exec('insertimage', url, title, width, height, border, align);
+					}
+					// Bugfix: [Firefox] 上传图片后，总是出现正在加载的样式，需要延迟执行hideDialog
+					setTimeout(function() {
+						self.hideDialog().focus();
+					}, 0);
+				}
+			});
+		},
+		'delete' : function() {
+			var target = self.plugin.getSelectedImage();
+			if (target.parent().name == 'a') {
+				target = target.parent();
+			}
+			target.remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.image.edit);
+});
diff --git a/public/assets/kindeditor/plugins/image/images/align_left.gif b/public/assets/kindeditor/plugins/image/images/align_left.gif
new file mode 100644
index 000000000..ab17f5679
Binary files /dev/null and b/public/assets/kindeditor/plugins/image/images/align_left.gif differ
diff --git a/public/assets/kindeditor/plugins/image/images/align_right.gif b/public/assets/kindeditor/plugins/image/images/align_right.gif
new file mode 100644
index 000000000..e8ebe6a63
Binary files /dev/null and b/public/assets/kindeditor/plugins/image/images/align_right.gif differ
diff --git a/public/assets/kindeditor/plugins/image/images/align_top.gif b/public/assets/kindeditor/plugins/image/images/align_top.gif
new file mode 100644
index 000000000..d8826a5bc
Binary files /dev/null and b/public/assets/kindeditor/plugins/image/images/align_top.gif differ
diff --git a/public/assets/kindeditor/plugins/image/images/refresh.png b/public/assets/kindeditor/plugins/image/images/refresh.png
new file mode 100644
index 000000000..77e12d1c6
Binary files /dev/null and b/public/assets/kindeditor/plugins/image/images/refresh.png differ
diff --git a/public/assets/kindeditor/plugins/insertfile/insertfile.js b/public/assets/kindeditor/plugins/insertfile/insertfile.js
new file mode 100644
index 000000000..b8c523e77
--- /dev/null
+++ b/public/assets/kindeditor/plugins/insertfile/insertfile.js
@@ -0,0 +1,138 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('insertfile', function(K) {
+	var self = this, name = 'insertfile',
+		allowFileUpload = K.undef(self.allowFileUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		lang = self.lang(name + '.');
+	self.plugin.fileDialog = function(options) {
+		var fileUrl = K.undef(options.fileUrl, 'http://'),
+			fileTitle = K.undef(options.fileTitle, ''),
+			clickFn = options.clickFn;
+		var html = [
+			'<div style="padding:20px;">',
+			'<div class="ke-dialog-row">',
+			'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+			'<input type="text" id="keUrl" name="url" class="ke-input-text" style="width:160px;" /> &nbsp;',
+			'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+			'</span>',
+			'</div>',
+			//title
+			'<div class="ke-dialog-row">',
+			'<label for="keTitle" style="width:60px;">' + lang.title + '</label>',
+			'<input type="text" id="keTitle" class="ke-input-text" name="title" value="" style="width:160px;" /></div>',
+			'</div>',
+			//form end
+			'</form>',
+			'</div>'
+			].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 450,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var url = K.trim(urlBox.val()),
+						title = titleBox.val();
+					if (url == 'http://' || K.invalidUrl(url)) {
+						alert(self.lang('invalidUrl'));
+						urlBox[0].focus();
+						return;
+					}
+					if (K.trim(title) === '') {
+						title = url;
+					}
+					clickFn.call(self, url, title);
+				}
+			}
+		}),
+		div = dialog.div;
+
+		var urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			titleBox = K('[name="title"]', div);
+
+		if (allowFileUpload) {
+			var uploadbutton = K.uploadbutton({
+				button : K('.ke-upload-button', div)[0],
+				fieldName : filePostName,
+				url : K.addParam(uploadJson, 'dir=file'),
+				extraParams : extraParams,
+				afterUpload : function(data) {
+					dialog.hideLoading();
+					if (data.error === 0) {
+						var url = data.url;
+						if (formatUploadUrl) {
+							url = K.formatUrl(url, 'absolute');
+						}
+						urlBox.val(url);
+						if (self.afterUpload) {
+							self.afterUpload.call(self, url, data, name);
+						}
+						alert(self.lang('uploadSuccess'));
+					} else {
+						alert(data.message);
+					}
+				},
+				afterError : function(html) {
+					dialog.hideLoading();
+					self.errorDialog(html);
+				}
+			});
+			uploadbutton.fileBox.change(function(e) {
+				dialog.showLoading(self.lang('uploadLoading'));
+				uploadbutton.submit();
+			});
+		} else {
+			K('.ke-upload-button', div).hide();
+		}
+		if (allowFileManager) {
+			viewServerBtn.click(function(e) {
+				self.loadPlugin('filemanager', function() {
+					self.plugin.filemanagerDialog({
+						viewType : 'LIST',
+						dirName : 'file',
+						clickFn : function(url, title) {
+							if (self.dialogs.length > 1) {
+								K('[name="url"]', div).val(url);
+								if (self.afterSelectFile) {
+									self.afterSelectFile.call(self, url);
+								}
+								self.hideDialog();
+							}
+						}
+					});
+				});
+			});
+		} else {
+			viewServerBtn.hide();
+		}
+		urlBox.val(fileUrl);
+		titleBox.val(fileTitle);
+		urlBox[0].focus();
+		urlBox[0].select();
+	};
+	self.clickToolbar(name, function() {
+		self.plugin.fileDialog({
+			clickFn : function(url, title) {
+				var html = '<a class="ke-insertfile" href="' + url + '" data-ke-src="' + url + '" target="_blank">' + title + '</a>';
+				self.insertHtml(html).hideDialog().focus();
+			}
+		});
+	});
+});
diff --git a/public/assets/kindeditor/plugins/lineheight/lineheight.js b/public/assets/kindeditor/plugins/lineheight/lineheight.js
new file mode 100644
index 000000000..ae679d788
--- /dev/null
+++ b/public/assets/kindeditor/plugins/lineheight/lineheight.js
@@ -0,0 +1,38 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('lineheight', function(K) {
+	var self = this, name = 'lineheight', lang = self.lang(name + '.');
+	self.clickToolbar(name, function() {
+		var curVal = '', commonNode = self.cmd.commonNode({'*' : '.line-height'});
+		if (commonNode) {
+			curVal = commonNode.css('line-height');
+		}
+		var menu = self.createMenu({
+			name : name,
+			width : 150
+		});
+		K.each(lang.lineHeight, function(i, row) {
+			K.each(row, function(key, val) {
+				menu.addItem({
+					title : val,
+					checked : curVal === key,
+					click : function() {
+						self.cmd.toggle('<span style="line-height:' + key + ';"></span>', {
+							span : '.line-height=' + key
+						});
+						self.updateState();
+						self.addBookmark();
+						self.hideMenu();
+					}
+				});
+			});
+		});
+	});
+});
diff --git a/public/assets/kindeditor/plugins/link/link.js b/public/assets/kindeditor/plugins/link/link.js
new file mode 100644
index 000000000..352fa3c64
--- /dev/null
+++ b/public/assets/kindeditor/plugins/link/link.js
@@ -0,0 +1,66 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('link', function(K) {
+	var self = this, name = 'link';
+	self.plugin.link = {
+		edit : function() {
+			var lang = self.lang(name + '.'),
+				html = '<div style="padding:20px;">' +
+					//url
+					'<div class="ke-dialog-row">' +
+					'<label for="keUrl" style="width:60px;">' + lang.url + '</label>' +
+					'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:260px;" /></div>' +
+					//type
+					'<div class="ke-dialog-row"">' +
+					'<label for="keType" style="width:60px;">' + lang.linkType + '</label>' +
+					'<select id="keType" name="type"></select>' +
+					'</div>' +
+					'</div>',
+				dialog = self.createDialog({
+					name : name,
+					width : 450,
+					title : self.lang(name),
+					body : html,
+					yesBtn : {
+						name : self.lang('yes'),
+						click : function(e) {
+							var url = K.trim(urlBox.val());
+							if (url == 'http://' || K.invalidUrl(url)) {
+								alert(self.lang('invalidUrl'));
+								urlBox[0].focus();
+								return;
+							}
+							self.exec('createlink', url, typeBox.val()).hideDialog().focus();
+						}
+					}
+				}),
+				div = dialog.div,
+				urlBox = K('input[name="url"]', div),
+				typeBox = K('select[name="type"]', div);
+			urlBox.val('http://');
+			typeBox[0].options[0] = new Option(lang.newWindow, '_blank');
+			typeBox[0].options[1] = new Option(lang.selfWindow, '');
+			self.cmd.selection();
+			var a = self.plugin.getSelectedLink();
+			if (a) {
+				self.cmd.range.selectNode(a[0]);
+				self.cmd.select();
+				urlBox.val(a.attr('data-ke-src'));
+				typeBox.val(a.attr('target'));
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.exec('unlink', null);
+		}
+	};
+	self.clickToolbar(name, self.plugin.link.edit);
+});
diff --git a/public/assets/kindeditor/plugins/map/map.html b/public/assets/kindeditor/plugins/map/map.html
new file mode 100644
index 000000000..1a9ad7d7b
--- /dev/null
+++ b/public/assets/kindeditor/plugins/map/map.html
@@ -0,0 +1,57 @@
+<!doctype html>
+<html>
+	<head>
+	<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+	<style>
+		html { height: 100% }
+		body { height: 100%; margin: 0; padding: 0; background-color: #FFF }
+		#map_canvas { height: 100% }
+	</style>
+	<script src="http://maps.googleapis.com/maps/api/js?sensor=false&language=zh_CN"></script>
+	<script>
+		var map, geocoder;
+		function initialize() {
+			var latlng = new google.maps.LatLng(31.230393, 121.473704);
+			var options = {
+				zoom: 11,
+				center: latlng,
+				disableDefaultUI: true,
+				panControl: true,
+				zoomControl: true,
+				mapTypeControl: true,
+				scaleControl: true,
+				streetViewControl: false,
+				overviewMapControl: true,
+				mapTypeId: google.maps.MapTypeId.ROADMAP
+			};
+			map = new google.maps.Map(document.getElementById("map_canvas"), options);
+			geocoder = new google.maps.Geocoder();
+			geocoder.geocode({latLng: latlng}, function(results, status) {
+				if (status == google.maps.GeocoderStatus.OK) {
+					if (results[3]) {
+						parent.document.getElementById("kindeditor_plugin_map_address").value = results[3].formatted_address;
+					}
+				}
+			});
+		}
+		function search(address) {
+			if (!map) return;
+			geocoder.geocode({address : address}, function(results, status) {
+				if (status == google.maps.GeocoderStatus.OK) {
+					map.setZoom(11);
+					map.setCenter(results[0].geometry.location);
+					var marker = new google.maps.Marker({
+						map: map,
+						position: results[0].geometry.location
+					});
+				} else {
+					alert("Invalid address: " + address);
+				}
+			});
+		}
+	</script>
+	</head>
+	<body onload="initialize();">
+		<div id="map_canvas" style="width:100%; height:100%"></div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/public/assets/kindeditor/plugins/map/map.js b/public/assets/kindeditor/plugins/map/map.js
new file mode 100644
index 000000000..529087525
--- /dev/null
+++ b/public/assets/kindeditor/plugins/map/map.js
@@ -0,0 +1,137 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// Google Maps: http://code.google.com/apis/maps/index.html
+
+KindEditor.plugin('map', function(K) {
+	var self = this, name = 'map', lang = self.lang(name + '.');
+	self.clickToolbar(name, function() {
+		var html = ['<div style="padding:10px 20px;">',
+			'<div class="ke-dialog-row">',
+			lang.address + ' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" name="searchBtn" class="ke-button-common ke-button" value="' + lang.search + '" />',
+			'</span>',
+			'</div>',
+			'<div class="ke-map" style="width:558px;height:360px;"></div>',
+			'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 600,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var geocoder = win.geocoder,
+						map = win.map,
+						center = map.getCenter().lat() + ',' + map.getCenter().lng(),
+						zoom = map.getZoom(),
+						maptype = map.getMapTypeId(),
+						url = 'http://maps.googleapis.com/maps/api/staticmap';
+						url += '?center=' + encodeURIComponent(center);
+						url += '&zoom=' + encodeURIComponent(zoom);
+						url += '&size=558x360';
+						url += '&maptype=' + encodeURIComponent(maptype);
+						url += '&markers=' + encodeURIComponent(center);
+						url += '&language=' + self.langType;
+						url += '&sensor=false';
+					self.exec('insertimage', url).hideDialog().focus();
+				}
+			},
+			beforeRemove : function() {
+				searchBtn.remove();
+				if (doc) {
+					doc.write('');
+				}
+				iframe.remove();
+			}
+		});
+		var div = dialog.div,
+			addressBox = K('[name="address"]', div),
+			searchBtn = K('[name="searchBtn"]', div),
+			win, doc;
+		var iframeHtml = ['<!doctype html><html><head>',
+			'<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />',
+			'<style>',
+			'	html { height: 100% }',
+			'	body { height: 100%; margin: 0; padding: 0; background-color: #FFF }',
+			'	#map_canvas { height: 100% }',
+			'</style>',
+			'<script src="http://maps.googleapis.com/maps/api/js?sensor=false&language=' + self.langType + '"></script>',
+			'<script>',
+			'var map, geocoder;',
+			'function initialize() {',
+			'	var latlng = new google.maps.LatLng(31.230393, 121.473704);',
+			'	var options = {',
+			'		zoom: 11,',
+			'		center: latlng,',
+			'		disableDefaultUI: true,',
+			'		panControl: true,',
+			'		zoomControl: true,',
+			'		mapTypeControl: true,',
+			'		scaleControl: true,',
+			'		streetViewControl: false,',
+			'		overviewMapControl: true,',
+			'		mapTypeId: google.maps.MapTypeId.ROADMAP',
+			'	};',
+			'	map = new google.maps.Map(document.getElementById("map_canvas"), options);',
+			'	geocoder = new google.maps.Geocoder();',
+			'	geocoder.geocode({latLng: latlng}, function(results, status) {',
+			'		if (status == google.maps.GeocoderStatus.OK) {',
+			'			if (results[3]) {',
+			'				parent.document.getElementById("kindeditor_plugin_map_address").value = results[3].formatted_address;',
+			'			}',
+			'		}',
+			'	});',
+			'}',
+			'function search(address) {',
+			'	if (!map) return;',
+			'	geocoder.geocode({address : address}, function(results, status) {',
+			'		if (status == google.maps.GeocoderStatus.OK) {',
+			'			map.setZoom(11);',
+			'			map.setCenter(results[0].geometry.location);',
+			'			var marker = new google.maps.Marker({',
+			'				map: map,',
+			'				position: results[0].geometry.location',
+			'			});',
+			'		} else {',
+			'			alert("Invalid address: " + address);',
+			'		}',
+			'	});',
+			'}',
+			'</script>',
+			'</head>',
+			'<body onload="initialize();">',
+			'<div id="map_canvas" style="width:100%; height:100%"></div>',
+			'</body></html>'].join('\n');
+		// TODO：用doc.write(iframeHtml)方式加载时，在IE6上第一次加载报错，暂时使用src方式
+		var iframe = K('<iframe class="ke-textarea" frameborder="0" src="' + self.pluginsPath + 'map/map.html" style="width:558px;height:360px;"></iframe>');
+		function ready() {
+			win = iframe[0].contentWindow;
+			doc = K.iframeDoc(iframe);
+			//doc.open();
+			//doc.write(iframeHtml);
+			//doc.close();
+		}
+		iframe.bind('load', function() {
+			iframe.unbind('load');
+			if (K.IE) {
+				ready();
+			} else {
+				setTimeout(ready, 0);
+			}
+		});
+		K('.ke-map', div).replaceWith(iframe);
+		// search map
+		searchBtn.click(function() {
+			win.search(addressBox.val());
+		});
+	});
+});
diff --git a/public/assets/kindeditor/plugins/media/media.js b/public/assets/kindeditor/plugins/media/media.js
new file mode 100644
index 000000000..58034662a
--- /dev/null
+++ b/public/assets/kindeditor/plugins/media/media.js
@@ -0,0 +1,170 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('media', function(K) {
+	var self = this, name = 'media', lang = self.lang(name + '.'),
+		allowMediaUpload = K.undef(self.allowMediaUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
+	self.plugin.media = {
+		edit : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//url
+				'<div class="ke-dialog-row">',
+				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<span class="ke-button-common ke-button-outer">',
+				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+				'</span>',
+				'</div>',
+				//width
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:60px;">' + lang.width + '</label>',
+				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" />',
+				'</div>',
+				//height
+				'<div class="ke-dialog-row">',
+				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
+				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" />',
+				'</div>',
+				//autostart
+				'<div class="ke-dialog-row">',
+				'<label for="keAutostart">' + lang.autostart + '</label>',
+				'<input type="checkbox" id="keAutostart" name="autostart" value="" /> ',
+				'</div>',
+				'</div>'
+			].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 450,
+				height : 230,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var url = K.trim(urlBox.val()),
+							width = widthBox.val(),
+							height = heightBox.val();
+						if (url == 'http://' || K.invalidUrl(url)) {
+							alert(self.lang('invalidUrl'));
+							urlBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
+								src : url,
+								type : K.mediaType(url),
+								width : width,
+								height : height,
+								autostart : autostartBox[0].checked ? 'true' : 'false',
+								loop : 'true'
+							});
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('[name="width"]', div),
+			heightBox = K('[name="height"]', div),
+			autostartBox = K('[name="autostart"]', div);
+			urlBox.val('http://');
+
+			if (allowMediaUpload) {
+				var uploadbutton = K.uploadbutton({
+					button : K('.ke-upload-button', div)[0],
+					fieldName : filePostName,
+					extraParams : extraParams,
+					url : K.addParam(uploadJson, 'dir=media'),
+					afterUpload : function(data) {
+						dialog.hideLoading();
+						if (data.error === 0) {
+							var url = data.url;
+							if (formatUploadUrl) {
+								url = K.formatUrl(url, 'absolute');
+							}
+							urlBox.val(url);
+							if (self.afterUpload) {
+								self.afterUpload.call(self, url, data, name);
+							}
+							alert(self.lang('uploadSuccess'));
+						} else {
+							alert(data.message);
+						}
+					},
+					afterError : function(html) {
+						dialog.hideLoading();
+						self.errorDialog(html);
+					}
+				});
+				uploadbutton.fileBox.change(function(e) {
+					dialog.showLoading(self.lang('uploadLoading'));
+					uploadbutton.submit();
+				});
+			} else {
+				K('.ke-upload-button', div).hide();
+			}
+
+			if (allowFileManager) {
+				viewServerBtn.click(function(e) {
+					self.loadPlugin('filemanager', function() {
+						self.plugin.filemanagerDialog({
+							viewType : 'LIST',
+							dirName : 'media',
+							clickFn : function(url, title) {
+								if (self.dialogs.length > 1) {
+									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
+									self.hideDialog();
+								}
+							}
+						});
+					});
+				});
+			} else {
+				viewServerBtn.hide();
+			}
+
+			var img = self.plugin.getSelectedMedia();
+			if (img) {
+				var attrs = K.mediaAttrs(img.attr('data-ke-tag'));
+				urlBox.val(attrs.src);
+				widthBox.val(K.removeUnit(img.css('width')) || attrs.width || 0);
+				heightBox.val(K.removeUnit(img.css('height')) || attrs.height || 0);
+				autostartBox[0].checked = (attrs.autostart === 'true');
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedMedia().remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.media.edit);
+});
diff --git a/public/assets/kindeditor/plugins/multiimage/images/image.png b/public/assets/kindeditor/plugins/multiimage/images/image.png
new file mode 100644
index 000000000..fe79cf0ad
Binary files /dev/null and b/public/assets/kindeditor/plugins/multiimage/images/image.png differ
diff --git a/public/assets/kindeditor/plugins/multiimage/images/select-files-en.png b/public/assets/kindeditor/plugins/multiimage/images/select-files-en.png
new file mode 100644
index 000000000..a926a6e3a
Binary files /dev/null and b/public/assets/kindeditor/plugins/multiimage/images/select-files-en.png differ
diff --git a/public/assets/kindeditor/plugins/multiimage/images/select-files-zh_CN.png b/public/assets/kindeditor/plugins/multiimage/images/select-files-zh_CN.png
new file mode 100644
index 000000000..5a31d364b
Binary files /dev/null and b/public/assets/kindeditor/plugins/multiimage/images/select-files-zh_CN.png differ
diff --git a/public/assets/kindeditor/plugins/multiimage/images/swfupload.swf b/public/assets/kindeditor/plugins/multiimage/images/swfupload.swf
new file mode 100644
index 000000000..e3f767031
Binary files /dev/null and b/public/assets/kindeditor/plugins/multiimage/images/swfupload.swf differ
diff --git a/public/assets/kindeditor/plugins/multiimage/multiimage.js b/public/assets/kindeditor/plugins/multiimage/multiimage.js
new file mode 100644
index 000000000..5e6ecf8ec
--- /dev/null
+++ b/public/assets/kindeditor/plugins/multiimage/multiimage.js
@@ -0,0 +1,1384 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+
+(function(K) {
+
+function KSWFUpload(options) {
+	this.init(options);
+}
+K.extend(KSWFUpload, {
+	init : function(options) {
+		var self = this;
+		options.afterError = options.afterError || function(str) {
+			alert(str);
+		};
+		self.options = options;
+		self.progressbars = {};
+		// template
+		self.div = K(options.container).html([
+			'<div class="ke-swfupload">',
+			'<div class="ke-swfupload-top">',
+			'<div class="ke-inline-block ke-swfupload-button">',
+			'<input type="button" value="Browse" />',
+			'</div>',
+			'<div class="ke-inline-block ke-swfupload-desc">' + options.uploadDesc + '</div>',
+			'<span class="ke-button-common ke-button-outer ke-swfupload-startupload">',
+			'<input type="button" class="ke-button-common ke-button" value="' + options.startButtonValue + '" />',
+			'</span>',
+			'</div>',
+			'<div class="ke-swfupload-body"></div>',
+			'</div>'
+		].join(''));
+		self.bodyDiv = K('.ke-swfupload-body', self.div);
+
+		function showError(itemDiv, msg) {
+			K('.ke-status > div', itemDiv).hide();
+			K('.ke-message', itemDiv).addClass('ke-error').show().html(K.escape(msg));
+		}
+
+		var settings = {
+			debug : false,
+			upload_url : options.uploadUrl,
+			flash_url : options.flashUrl,
+			file_post_name : options.filePostName,
+			button_placeholder : K('.ke-swfupload-button > input', self.div)[0],
+			button_image_url: options.buttonImageUrl,
+			button_width: options.buttonWidth,
+			button_height: options.buttonHeight,
+			button_cursor : SWFUpload.CURSOR.HAND,
+			file_types : options.fileTypes,
+			file_types_description : options.fileTypesDesc,
+			file_upload_limit : options.fileUploadLimit,
+			file_size_limit : options.fileSizeLimit,
+			post_params : options.postParams,
+			file_queued_handler : function(file) {
+				file.url = self.options.fileIconUrl;
+				self.appendFile(file);
+			},
+			file_queue_error_handler : function(file, errorCode, message) {
+				var errorName = '';
+				switch (errorCode) {
+					case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:
+						errorName = options.queueLimitExceeded;
+						break;
+					case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
+						errorName = options.fileExceedsSizeLimit;
+						break;
+					case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
+						errorName = options.zeroByteFile;
+						break;
+					case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
+						errorName = options.invalidFiletype;
+						break;
+					default:
+						errorName = options.unknownError;
+						break;
+				}
+				K.DEBUG && alert(errorName);
+			},
+			upload_start_handler : function(file) {
+				var self = this;
+				var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv);
+				K('.ke-status > div', itemDiv).hide();
+				K('.ke-progressbar', itemDiv).show();
+			},
+			upload_progress_handler : function(file, bytesLoaded, bytesTotal) {
+				var percent = Math.round(bytesLoaded * 100 / bytesTotal);
+				var progressbar = self.progressbars[file.id];
+				progressbar.bar.css('width', Math.round(percent * 80 / 100) + 'px');
+				progressbar.percent.html(percent + '%');
+			},
+			upload_error_handler : function(file, errorCode, message) {
+				if (file && file.filestatus == SWFUpload.FILE_STATUS.ERROR) {
+					var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv).eq(0);
+					showError(itemDiv, self.options.errorMessage);
+				}
+			},
+			upload_success_handler : function(file, serverData) {
+				var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv).eq(0);
+				var data = {};
+				try {
+					data = K.json(serverData);
+				} catch (e) {
+					self.options.afterError.call(this, '<!doctype html><html>' + serverData + '</html>');
+				}
+				if (data.error !== 0) {
+					showError(itemDiv, K.DEBUG ? data.message : self.options.errorMessage);
+					return;
+				}
+				file.url = data.url;
+				K('.ke-img', itemDiv).attr('src', file.url).attr('data-status', file.filestatus).data('data', data);
+				K('.ke-status > div', itemDiv).hide();
+			}
+		};
+		self.swfu = new SWFUpload(settings);
+
+		K('.ke-swfupload-startupload input', self.div).click(function() {
+			self.swfu.startUpload();
+		});
+	},
+	getUrlList : function() {
+		var list = [];
+		K('.ke-img', self.bodyDiv).each(function() {
+			var img = K(this);
+			var status = img.attr('data-status');
+			if (status == SWFUpload.FILE_STATUS.COMPLETE) {
+				list.push(img.data('data'));
+			}
+		});
+		return list;
+	},
+	removeFile : function(fileId) {
+		var self = this;
+		self.swfu.cancelUpload(fileId);
+		var itemDiv = K('div[data-id="' + fileId + '"]', self.bodyDiv);
+		K('.ke-photo', itemDiv).unbind();
+		K('.ke-delete', itemDiv).unbind();
+		itemDiv.remove();
+	},
+	removeFiles : function() {
+		var self = this;
+		K('.ke-item', self.bodyDiv).each(function() {
+			self.removeFile(K(this).attr('data-id'));
+		});
+	},
+	appendFile : function(file) {
+		var self = this;
+		var itemDiv = K('<div class="ke-inline-block ke-item" data-id="' + file.id + '"></div>');
+		self.bodyDiv.append(itemDiv);
+		var photoDiv = K('<div class="ke-inline-block ke-photo"></div>')
+			.mouseover(function(e) {
+				K(this).addClass('ke-on');
+			})
+			.mouseout(function(e) {
+				K(this).removeClass('ke-on');
+			});
+		itemDiv.append(photoDiv);
+
+		var img = K('<img src="' + file.url + '" class="ke-img" data-status="' + file.filestatus + '" width="80" height="80" alt="' + file.name + '" />');
+		photoDiv.append(img);
+		K('<span class="ke-delete"></span>').appendTo(photoDiv).click(function() {
+			self.removeFile(file.id);
+		});
+		var statusDiv = K('<div class="ke-status"></div>').appendTo(photoDiv);
+		// progressbar
+		K(['<div class="ke-progressbar">',
+			'<div class="ke-progressbar-bar"><div class="ke-progressbar-bar-inner"></div></div>',
+			'<div class="ke-progressbar-percent">0%</div></div>'].join('')).hide().appendTo(statusDiv);
+		// message
+		K('<div class="ke-message">' + self.options.pendingMessage + '</div>').appendTo(statusDiv);
+
+		itemDiv.append('<div class="ke-name">' + file.name + '</div>');
+
+		self.progressbars[file.id] = {
+			bar : K('.ke-progressbar-bar-inner', photoDiv),
+			percent : K('.ke-progressbar-percent', photoDiv)
+		};
+	},
+	remove : function() {
+		this.removeFiles();
+		this.swfu.destroy();
+		this.div.html('');
+	}
+});
+
+K.swfupload = function(element, options) {
+	return new KSWFUpload(element, options);
+};
+
+})(KindEditor);
+
+KindEditor.plugin('multiimage', function(K) {
+	var self = this, name = 'multiimage',
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		imgPath = self.pluginsPath + 'multiimage/images/',
+		imageSizeLimit = K.undef(self.imageSizeLimit, '1MB'),
+		imageFileTypes = K.undef(self.imageFileTypes, '*.jpg;*.gif;*.png'),
+		imageUploadLimit = K.undef(self.imageUploadLimit, 20),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		lang = self.lang(name + '.');
+
+	self.plugin.multiImageDialog = function(options) {
+		var clickFn = options.clickFn,
+			uploadDesc = K.tmpl(lang.uploadDesc, {uploadLimit : imageUploadLimit, sizeLimit : imageSizeLimit});
+		var html = [
+			'<div style="padding:20px;">',
+			'<div class="swfupload">',
+			'</div>',
+			'</div>'
+		].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 650,
+			height : 510,
+			title : self.lang(name),
+			body : html,
+			previewBtn : {
+				name : lang.insertAll,
+				click : function(e) {
+					clickFn.call(self, swfupload.getUrlList());
+				}
+			},
+			yesBtn : {
+				name : lang.clearAll,
+				click : function(e) {
+					swfupload.removeFiles();
+				}
+			},
+			beforeRemove : function() {
+				// IE9 bugfix: https://github.com/kindsoft/kindeditor/issues/72
+				if (!K.IE || K.V <= 8) {
+					swfupload.remove();
+				}
+			}
+		}),
+		div = dialog.div;
+
+		var swfupload = K.swfupload({
+			container : K('.swfupload', div),
+			buttonImageUrl : imgPath + (self.langType == 'zh_CN' ? 'select-files-zh_CN.png' : 'select-files-en.png'),
+			buttonWidth : self.langType == 'zh_CN' ? 72 : 88,
+			buttonHeight : 23,
+			fileIconUrl : imgPath + 'image.png',
+			uploadDesc : uploadDesc,
+			startButtonValue : lang.startUpload,
+			uploadUrl : K.addParam(uploadJson, 'dir=image'),
+			flashUrl : imgPath + 'swfupload.swf',
+			filePostName : filePostName,
+			fileTypes : '*.jpg;*.jpeg;*.gif;*.png;*.bmp',
+			fileTypesDesc : 'Image Files',
+			fileUploadLimit : imageUploadLimit,
+			fileSizeLimit : imageSizeLimit,
+			postParams :  K.undef(self.extraFileUploadParams, {}),
+			queueLimitExceeded : lang.queueLimitExceeded,
+			fileExceedsSizeLimit : lang.fileExceedsSizeLimit,
+			zeroByteFile : lang.zeroByteFile,
+			invalidFiletype : lang.invalidFiletype,
+			unknownError : lang.unknownError,
+			pendingMessage : lang.pending,
+			errorMessage : lang.uploadError,
+			afterError : function(html) {
+				self.errorDialog(html);
+			}
+		});
+
+		return dialog;
+	};
+	self.clickToolbar(name, function() {
+		self.plugin.multiImageDialog({
+			clickFn : function (urlList) {
+				if (urlList.length === 0) {
+					return;
+				}
+				K.each(urlList, function(i, data) {
+					if (self.afterUpload) {
+						self.afterUpload.call(self, data.url, data, 'multiimage');
+					}
+					self.exec('insertimage', data.url, data.title, data.width, data.height, data.border, data.align);
+				});
+				// Bugfix: [Firefox] 上传图片后，总是出现正在加载的样式，需要延迟执行hideDialog
+				setTimeout(function() {
+					self.hideDialog().focus();
+				}, 0);
+			}
+		});
+	});
+});
+
+
+/**
+ * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
+ *
+ * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/,  http://www.vinterwebb.se/
+ *
+ * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilz閚 and Mammon Media and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ */
+
+
+/* ******************* */
+/* Constructor & Init  */
+/* ******************* */
+
+(function() {
+
+window.SWFUpload = function (settings) {
+	this.initSWFUpload(settings);
+};
+
+SWFUpload.prototype.initSWFUpload = function (settings) {
+	try {
+		this.customSettings = {};	// A container where developers can place their own settings associated with this instance.
+		this.settings = settings;
+		this.eventQueue = [];
+		this.movieName = "KindEditor_SWFUpload_" + SWFUpload.movieCount++;
+		this.movieElement = null;
+
+
+		// Setup global control tracking
+		SWFUpload.instances[this.movieName] = this;
+
+		// Load the settings.  Load the Flash movie.
+		this.initSettings();
+		this.loadFlash();
+		this.displayDebugInfo();
+	} catch (ex) {
+		delete SWFUpload.instances[this.movieName];
+		throw ex;
+	}
+};
+
+/* *************** */
+/* Static Members  */
+/* *************** */
+SWFUpload.instances = {};
+SWFUpload.movieCount = 0;
+SWFUpload.version = "2.2.0 2009-03-25";
+SWFUpload.QUEUE_ERROR = {
+	QUEUE_LIMIT_EXCEEDED	  		: -100,
+	FILE_EXCEEDS_SIZE_LIMIT  		: -110,
+	ZERO_BYTE_FILE			  		: -120,
+	INVALID_FILETYPE		  		: -130
+};
+SWFUpload.UPLOAD_ERROR = {
+	HTTP_ERROR				  		: -200,
+	MISSING_UPLOAD_URL	      		: -210,
+	IO_ERROR				  		: -220,
+	SECURITY_ERROR			  		: -230,
+	UPLOAD_LIMIT_EXCEEDED	  		: -240,
+	UPLOAD_FAILED			  		: -250,
+	SPECIFIED_FILE_ID_NOT_FOUND		: -260,
+	FILE_VALIDATION_FAILED	  		: -270,
+	FILE_CANCELLED			  		: -280,
+	UPLOAD_STOPPED					: -290
+};
+SWFUpload.FILE_STATUS = {
+	QUEUED		 : -1,
+	IN_PROGRESS	 : -2,
+	ERROR		 : -3,
+	COMPLETE	 : -4,
+	CANCELLED	 : -5
+};
+SWFUpload.BUTTON_ACTION = {
+	SELECT_FILE  : -100,
+	SELECT_FILES : -110,
+	START_UPLOAD : -120
+};
+SWFUpload.CURSOR = {
+	ARROW : -1,
+	HAND : -2
+};
+SWFUpload.WINDOW_MODE = {
+	WINDOW : "window",
+	TRANSPARENT : "transparent",
+	OPAQUE : "opaque"
+};
+
+// Private: takes a URL, determines if it is relative and converts to an absolute URL
+// using the current site. Only processes the URL if it can, otherwise returns the URL untouched
+SWFUpload.completeURL = function(url) {
+	if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//)) {
+		return url;
+	}
+
+	var currentURL = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ":" + window.location.port : "");
+
+	var indexSlash = window.location.pathname.lastIndexOf("/");
+	if (indexSlash <= 0) {
+		path = "/";
+	} else {
+		path = window.location.pathname.substr(0, indexSlash) + "/";
+	}
+
+	return /*currentURL +*/ path + url;
+
+};
+
+
+/* ******************** */
+/* Instance Members  */
+/* ******************** */
+
+// Private: initSettings ensures that all the
+// settings are set, getting a default value if one was not assigned.
+SWFUpload.prototype.initSettings = function () {
+	this.ensureDefault = function (settingName, defaultValue) {
+		this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
+	};
+
+	// Upload backend settings
+	this.ensureDefault("upload_url", "");
+	this.ensureDefault("preserve_relative_urls", false);
+	this.ensureDefault("file_post_name", "Filedata");
+	this.ensureDefault("post_params", {});
+	this.ensureDefault("use_query_string", false);
+	this.ensureDefault("requeue_on_error", false);
+	this.ensureDefault("http_success", []);
+	this.ensureDefault("assume_success_timeout", 0);
+
+	// File Settings
+	this.ensureDefault("file_types", "*.*");
+	this.ensureDefault("file_types_description", "All Files");
+	this.ensureDefault("file_size_limit", 0);	// Default zero means "unlimited"
+	this.ensureDefault("file_upload_limit", 0);
+	this.ensureDefault("file_queue_limit", 0);
+
+	// Flash Settings
+	this.ensureDefault("flash_url", "swfupload.swf");
+	this.ensureDefault("prevent_swf_caching", true);
+
+	// Button Settings
+	this.ensureDefault("button_image_url", "");
+	this.ensureDefault("button_width", 1);
+	this.ensureDefault("button_height", 1);
+	this.ensureDefault("button_text", "");
+	this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
+	this.ensureDefault("button_text_top_padding", 0);
+	this.ensureDefault("button_text_left_padding", 0);
+	this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
+	this.ensureDefault("button_disabled", false);
+	this.ensureDefault("button_placeholder_id", "");
+	this.ensureDefault("button_placeholder", null);
+	this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
+	this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
+
+	// Debug Settings
+	this.ensureDefault("debug", false);
+	this.settings.debug_enabled = this.settings.debug;	// Here to maintain v2 API
+
+	// Event Handlers
+	this.settings.return_upload_start_handler = this.returnUploadStart;
+	this.ensureDefault("swfupload_loaded_handler", null);
+	this.ensureDefault("file_dialog_start_handler", null);
+	this.ensureDefault("file_queued_handler", null);
+	this.ensureDefault("file_queue_error_handler", null);
+	this.ensureDefault("file_dialog_complete_handler", null);
+
+	this.ensureDefault("upload_start_handler", null);
+	this.ensureDefault("upload_progress_handler", null);
+	this.ensureDefault("upload_error_handler", null);
+	this.ensureDefault("upload_success_handler", null);
+	this.ensureDefault("upload_complete_handler", null);
+
+	this.ensureDefault("debug_handler", this.debugMessage);
+
+	this.ensureDefault("custom_settings", {});
+
+	// Other settings
+	this.customSettings = this.settings.custom_settings;
+
+	// Update the flash url if needed
+	if (!!this.settings.prevent_swf_caching) {
+		this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
+	}
+
+	if (!this.settings.preserve_relative_urls) {
+		//this.settings.flash_url = SWFUpload.completeURL(this.settings.flash_url);	// Don't need to do this one since flash doesn't look at it
+		this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
+		this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
+	}
+
+	delete this.ensureDefault;
+};
+
+// Private: loadFlash replaces the button_placeholder element with the flash movie.
+SWFUpload.prototype.loadFlash = function () {
+	var targetElement, tempParent;
+
+	// Make sure an element with the ID we are going to use doesn't already exist
+	if (document.getElementById(this.movieName) !== null) {
+		throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
+	}
+
+	// Get the element where we will be placing the flash movie
+	targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
+
+	if (targetElement == undefined) {
+		throw "Could not find the placeholder element: " + this.settings.button_placeholder_id;
+	}
+
+	// Append the container and load the flash
+	tempParent = document.createElement("div");
+	tempParent.innerHTML = this.getFlashHTML();	// Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
+	targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
+
+	// Fix IE Flash/Form bug
+	if (window[this.movieName] == undefined) {
+		window[this.movieName] = this.getMovieElement();
+	}
+
+};
+
+// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
+SWFUpload.prototype.getFlashHTML = function () {
+	// Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
+	// Fix bug for IE9
+	// http://www.kindsoft.net/view.php?bbsid=7&postid=5825&pagenum=1
+	var classid = '';
+	if (KindEditor.IE && KindEditor.V > 8) {
+		classid = ' classid = "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"';
+	}
+	return ['<object id="', this.movieName, '"' + classid + ' type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
+				'<param name="wmode" value="', this.settings.button_window_mode, '" />',
+				'<param name="movie" value="', this.settings.flash_url, '" />',
+				'<param name="quality" value="high" />',
+				'<param name="menu" value="false" />',
+				'<param name="allowScriptAccess" value="always" />',
+				'<param name="flashvars" value="' + this.getFlashVars() + '" />',
+				'</object>'].join("");
+};
+
+// Private: getFlashVars builds the parameter string that will be passed
+// to flash in the flashvars param.
+SWFUpload.prototype.getFlashVars = function () {
+	// Build a string from the post param object
+	var paramString = this.buildParamString();
+	var httpSuccessString = this.settings.http_success.join(",");
+
+	// Build the parameter string
+	return ["movieName=", encodeURIComponent(this.movieName),
+			"&amp;uploadURL=", encodeURIComponent(this.settings.upload_url),
+			"&amp;useQueryString=", encodeURIComponent(this.settings.use_query_string),
+			"&amp;requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
+			"&amp;httpSuccess=", encodeURIComponent(httpSuccessString),
+			"&amp;assumeSuccessTimeout=", encodeURIComponent(this.settings.assume_success_timeout),
+			"&amp;params=", encodeURIComponent(paramString),
+			"&amp;filePostName=", encodeURIComponent(this.settings.file_post_name),
+			"&amp;fileTypes=", encodeURIComponent(this.settings.file_types),
+			"&amp;fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
+			"&amp;fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
+			"&amp;fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
+			"&amp;fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
+			"&amp;debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
+			"&amp;buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
+			"&amp;buttonWidth=", encodeURIComponent(this.settings.button_width),
+			"&amp;buttonHeight=", encodeURIComponent(this.settings.button_height),
+			"&amp;buttonText=", encodeURIComponent(this.settings.button_text),
+			"&amp;buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
+			"&amp;buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
+			"&amp;buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
+			"&amp;buttonAction=", encodeURIComponent(this.settings.button_action),
+			"&amp;buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
+			"&amp;buttonCursor=", encodeURIComponent(this.settings.button_cursor)
+		].join("");
+};
+
+// Public: getMovieElement retrieves the DOM reference to the Flash element added by SWFUpload
+// The element is cached after the first lookup
+SWFUpload.prototype.getMovieElement = function () {
+	if (this.movieElement == undefined) {
+		this.movieElement = document.getElementById(this.movieName);
+	}
+
+	if (this.movieElement === null) {
+		throw "Could not find Flash element";
+	}
+
+	return this.movieElement;
+};
+
+// Private: buildParamString takes the name/value pairs in the post_params setting object
+// and joins them up in to a string formatted "name=value&amp;name=value"
+SWFUpload.prototype.buildParamString = function () {
+	var postParams = this.settings.post_params;
+	var paramStringPairs = [];
+
+	if (typeof(postParams) === "object") {
+		for (var name in postParams) {
+			if (postParams.hasOwnProperty(name)) {
+				paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
+			}
+		}
+	}
+
+	return paramStringPairs.join("&amp;");
+};
+
+// Public: Used to remove a SWFUpload instance from the page. This method strives to remove
+// all references to the SWF, and other objects so memory is properly freed.
+// Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
+// Credits: Major improvements provided by steffen
+SWFUpload.prototype.destroy = function () {
+	try {
+		// Make sure Flash is done before we try to remove it
+		this.cancelUpload(null, false);
+
+
+		// Remove the SWFUpload DOM nodes
+		var movieElement = null;
+		movieElement = this.getMovieElement();
+
+		if (movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
+			// Loop through all the movie's properties and remove all function references (DOM/JS IE 6/7 memory leak workaround)
+			for (var i in movieElement) {
+				try {
+					if (typeof(movieElement[i]) === "function") {
+						movieElement[i] = null;
+					}
+				} catch (ex1) {}
+			}
+
+			// Remove the Movie Element from the page
+			try {
+				movieElement.parentNode.removeChild(movieElement);
+			} catch (ex) {}
+		}
+
+		// Remove IE form fix reference
+		window[this.movieName] = null;
+
+		// Destroy other references
+		SWFUpload.instances[this.movieName] = null;
+		delete SWFUpload.instances[this.movieName];
+
+		this.movieElement = null;
+		this.settings = null;
+		this.customSettings = null;
+		this.eventQueue = null;
+		this.movieName = null;
+
+
+		return true;
+	} catch (ex2) {
+		return false;
+	}
+};
+
+
+// Public: displayDebugInfo prints out settings and configuration
+// information about this SWFUpload instance.
+// This function (and any references to it) can be deleted when placing
+// SWFUpload in production.
+SWFUpload.prototype.displayDebugInfo = function () {
+	this.debug(
+		[
+			"---SWFUpload Instance Info---\n",
+			"Version: ", SWFUpload.version, "\n",
+			"Movie Name: ", this.movieName, "\n",
+			"Settings:\n",
+			"\t", "upload_url:               ", this.settings.upload_url, "\n",
+			"\t", "flash_url:                ", this.settings.flash_url, "\n",
+			"\t", "use_query_string:         ", this.settings.use_query_string.toString(), "\n",
+			"\t", "requeue_on_error:         ", this.settings.requeue_on_error.toString(), "\n",
+			"\t", "http_success:             ", this.settings.http_success.join(", "), "\n",
+			"\t", "assume_success_timeout:   ", this.settings.assume_success_timeout, "\n",
+			"\t", "file_post_name:           ", this.settings.file_post_name, "\n",
+			"\t", "post_params:              ", this.settings.post_params.toString(), "\n",
+			"\t", "file_types:               ", this.settings.file_types, "\n",
+			"\t", "file_types_description:   ", this.settings.file_types_description, "\n",
+			"\t", "file_size_limit:          ", this.settings.file_size_limit, "\n",
+			"\t", "file_upload_limit:        ", this.settings.file_upload_limit, "\n",
+			"\t", "file_queue_limit:         ", this.settings.file_queue_limit, "\n",
+			"\t", "debug:                    ", this.settings.debug.toString(), "\n",
+
+			"\t", "prevent_swf_caching:      ", this.settings.prevent_swf_caching.toString(), "\n",
+
+			"\t", "button_placeholder_id:    ", this.settings.button_placeholder_id.toString(), "\n",
+			"\t", "button_placeholder:       ", (this.settings.button_placeholder ? "Set" : "Not Set"), "\n",
+			"\t", "button_image_url:         ", this.settings.button_image_url.toString(), "\n",
+			"\t", "button_width:             ", this.settings.button_width.toString(), "\n",
+			"\t", "button_height:            ", this.settings.button_height.toString(), "\n",
+			"\t", "button_text:              ", this.settings.button_text.toString(), "\n",
+			"\t", "button_text_style:        ", this.settings.button_text_style.toString(), "\n",
+			"\t", "button_text_top_padding:  ", this.settings.button_text_top_padding.toString(), "\n",
+			"\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
+			"\t", "button_action:            ", this.settings.button_action.toString(), "\n",
+			"\t", "button_disabled:          ", this.settings.button_disabled.toString(), "\n",
+
+			"\t", "custom_settings:          ", this.settings.custom_settings.toString(), "\n",
+			"Event Handlers:\n",
+			"\t", "swfupload_loaded_handler assigned:  ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
+			"\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
+			"\t", "file_queued_handler assigned:       ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
+			"\t", "file_queue_error_handler assigned:  ", (typeof this.settings.file_queue_error_handler === "function").toString(), "\n",
+			"\t", "upload_start_handler assigned:      ", (typeof this.settings.upload_start_handler === "function").toString(), "\n",
+			"\t", "upload_progress_handler assigned:   ", (typeof this.settings.upload_progress_handler === "function").toString(), "\n",
+			"\t", "upload_error_handler assigned:      ", (typeof this.settings.upload_error_handler === "function").toString(), "\n",
+			"\t", "upload_success_handler assigned:    ", (typeof this.settings.upload_success_handler === "function").toString(), "\n",
+			"\t", "upload_complete_handler assigned:   ", (typeof this.settings.upload_complete_handler === "function").toString(), "\n",
+			"\t", "debug_handler assigned:             ", (typeof this.settings.debug_handler === "function").toString(), "\n"
+		].join("")
+	);
+};
+
+/* Note: addSetting and getSetting are no longer used by SWFUpload but are included
+	the maintain v2 API compatibility
+*/
+// Public: (Deprecated) addSetting adds a setting value. If the value given is undefined or null then the default_value is used.
+SWFUpload.prototype.addSetting = function (name, value, default_value) {
+    if (value == undefined) {
+        return (this.settings[name] = default_value);
+    } else {
+        return (this.settings[name] = value);
+	}
+};
+
+// Public: (Deprecated) getSetting gets a setting. Returns an empty string if the setting was not found.
+SWFUpload.prototype.getSetting = function (name) {
+    if (this.settings[name] != undefined) {
+        return this.settings[name];
+	}
+
+    return "";
+};
+
+
+
+// Private: callFlash handles function calls made to the Flash element.
+// Calls are made with a setTimeout for some functions to work around
+// bugs in the ExternalInterface library.
+SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
+	argumentArray = argumentArray || [];
+
+	var movieElement = this.getMovieElement();
+	var returnValue, returnString;
+
+	// Flash's method if calling ExternalInterface methods (code adapted from MooTools).
+	try {
+		returnString = movieElement.CallFunction('<invoke name="' + functionName + '" returntype="javascript">' + __flash__argumentsToXML(argumentArray, 0) + '</invoke>');
+		returnValue = eval(returnString);
+	} catch (ex) {
+		throw "Call to " + functionName + " failed";
+	}
+
+	// Unescape file post param values
+	if (returnValue != undefined && typeof returnValue.post === "object") {
+		returnValue = this.unescapeFilePostParams(returnValue);
+	}
+
+	return returnValue;
+};
+
+/* *****************************
+	-- Flash control methods --
+	Your UI should use these
+	to operate SWFUpload
+   ***************************** */
+
+// WARNING: this function does not work in Flash Player 10
+// Public: selectFile causes a File Selection Dialog window to appear.  This
+// dialog only allows 1 file to be selected.
+SWFUpload.prototype.selectFile = function () {
+	this.callFlash("SelectFile");
+};
+
+// WARNING: this function does not work in Flash Player 10
+// Public: selectFiles causes a File Selection Dialog window to appear/ This
+// dialog allows the user to select any number of files
+// Flash Bug Warning: Flash limits the number of selectable files based on the combined length of the file names.
+// If the selection name length is too long the dialog will fail in an unpredictable manner.  There is no work-around
+// for this bug.
+SWFUpload.prototype.selectFiles = function () {
+	this.callFlash("SelectFiles");
+};
+
+
+// Public: startUpload starts uploading the first file in the queue unless
+// the optional parameter 'fileID' specifies the ID
+SWFUpload.prototype.startUpload = function (fileID) {
+	this.callFlash("StartUpload", [fileID]);
+};
+
+// Public: cancelUpload cancels any queued file.  The fileID parameter may be the file ID or index.
+// If you do not specify a fileID the current uploading file or first file in the queue is cancelled.
+// If you do not want the uploadError event to trigger you can specify false for the triggerErrorEvent parameter.
+SWFUpload.prototype.cancelUpload = function (fileID, triggerErrorEvent) {
+	if (triggerErrorEvent !== false) {
+		triggerErrorEvent = true;
+	}
+	this.callFlash("CancelUpload", [fileID, triggerErrorEvent]);
+};
+
+// Public: stopUpload stops the current upload and requeues the file at the beginning of the queue.
+// If nothing is currently uploading then nothing happens.
+SWFUpload.prototype.stopUpload = function () {
+	this.callFlash("StopUpload");
+};
+
+/* ************************
+ * Settings methods
+ *   These methods change the SWFUpload settings.
+ *   SWFUpload settings should not be changed directly on the settings object
+ *   since many of the settings need to be passed to Flash in order to take
+ *   effect.
+ * *********************** */
+
+// Public: getStats gets the file statistics object.
+SWFUpload.prototype.getStats = function () {
+	return this.callFlash("GetStats");
+};
+
+// Public: setStats changes the SWFUpload statistics.  You shouldn't need to
+// change the statistics but you can.  Changing the statistics does not
+// affect SWFUpload accept for the successful_uploads count which is used
+// by the upload_limit setting to determine how many files the user may upload.
+SWFUpload.prototype.setStats = function (statsObject) {
+	this.callFlash("SetStats", [statsObject]);
+};
+
+// Public: getFile retrieves a File object by ID or Index.  If the file is
+// not found then 'null' is returned.
+SWFUpload.prototype.getFile = function (fileID) {
+	if (typeof(fileID) === "number") {
+		return this.callFlash("GetFileByIndex", [fileID]);
+	} else {
+		return this.callFlash("GetFile", [fileID]);
+	}
+};
+
+// Public: addFileParam sets a name/value pair that will be posted with the
+// file specified by the Files ID.  If the name already exists then the
+// exiting value will be overwritten.
+SWFUpload.prototype.addFileParam = function (fileID, name, value) {
+	return this.callFlash("AddFileParam", [fileID, name, value]);
+};
+
+// Public: removeFileParam removes a previously set (by addFileParam) name/value
+// pair from the specified file.
+SWFUpload.prototype.removeFileParam = function (fileID, name) {
+	this.callFlash("RemoveFileParam", [fileID, name]);
+};
+
+// Public: setUploadUrl changes the upload_url setting.
+SWFUpload.prototype.setUploadURL = function (url) {
+	this.settings.upload_url = url.toString();
+	this.callFlash("SetUploadURL", [url]);
+};
+
+// Public: setPostParams changes the post_params setting
+SWFUpload.prototype.setPostParams = function (paramsObject) {
+	this.settings.post_params = paramsObject;
+	this.callFlash("SetPostParams", [paramsObject]);
+};
+
+// Public: addPostParam adds post name/value pair.  Each name can have only one value.
+SWFUpload.prototype.addPostParam = function (name, value) {
+	this.settings.post_params[name] = value;
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+
+// Public: removePostParam deletes post name/value pair.
+SWFUpload.prototype.removePostParam = function (name) {
+	delete this.settings.post_params[name];
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+
+// Public: setFileTypes changes the file_types setting and the file_types_description setting
+SWFUpload.prototype.setFileTypes = function (types, description) {
+	this.settings.file_types = types;
+	this.settings.file_types_description = description;
+	this.callFlash("SetFileTypes", [types, description]);
+};
+
+// Public: setFileSizeLimit changes the file_size_limit setting
+SWFUpload.prototype.setFileSizeLimit = function (fileSizeLimit) {
+	this.settings.file_size_limit = fileSizeLimit;
+	this.callFlash("SetFileSizeLimit", [fileSizeLimit]);
+};
+
+// Public: setFileUploadLimit changes the file_upload_limit setting
+SWFUpload.prototype.setFileUploadLimit = function (fileUploadLimit) {
+	this.settings.file_upload_limit = fileUploadLimit;
+	this.callFlash("SetFileUploadLimit", [fileUploadLimit]);
+};
+
+// Public: setFileQueueLimit changes the file_queue_limit setting
+SWFUpload.prototype.setFileQueueLimit = function (fileQueueLimit) {
+	this.settings.file_queue_limit = fileQueueLimit;
+	this.callFlash("SetFileQueueLimit", [fileQueueLimit]);
+};
+
+// Public: setFilePostName changes the file_post_name setting
+SWFUpload.prototype.setFilePostName = function (filePostName) {
+	this.settings.file_post_name = filePostName;
+	this.callFlash("SetFilePostName", [filePostName]);
+};
+
+// Public: setUseQueryString changes the use_query_string setting
+SWFUpload.prototype.setUseQueryString = function (useQueryString) {
+	this.settings.use_query_string = useQueryString;
+	this.callFlash("SetUseQueryString", [useQueryString]);
+};
+
+// Public: setRequeueOnError changes the requeue_on_error setting
+SWFUpload.prototype.setRequeueOnError = function (requeueOnError) {
+	this.settings.requeue_on_error = requeueOnError;
+	this.callFlash("SetRequeueOnError", [requeueOnError]);
+};
+
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setHTTPSuccess = function (http_status_codes) {
+	if (typeof http_status_codes === "string") {
+		http_status_codes = http_status_codes.replace(" ", "").split(",");
+	}
+
+	this.settings.http_success = http_status_codes;
+	this.callFlash("SetHTTPSuccess", [http_status_codes]);
+};
+
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setAssumeSuccessTimeout = function (timeout_seconds) {
+	this.settings.assume_success_timeout = timeout_seconds;
+	this.callFlash("SetAssumeSuccessTimeout", [timeout_seconds]);
+};
+
+// Public: setDebugEnabled changes the debug_enabled setting
+SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
+	this.settings.debug_enabled = debugEnabled;
+	this.callFlash("SetDebugEnabled", [debugEnabled]);
+};
+
+// Public: setButtonImageURL loads a button image sprite
+SWFUpload.prototype.setButtonImageURL = function (buttonImageURL) {
+	if (buttonImageURL == undefined) {
+		buttonImageURL = "";
+	}
+
+	this.settings.button_image_url = buttonImageURL;
+	this.callFlash("SetButtonImageURL", [buttonImageURL]);
+};
+
+// Public: setButtonDimensions resizes the Flash Movie and button
+SWFUpload.prototype.setButtonDimensions = function (width, height) {
+	this.settings.button_width = width;
+	this.settings.button_height = height;
+
+	var movie = this.getMovieElement();
+	if (movie != undefined) {
+		movie.style.width = width + "px";
+		movie.style.height = height + "px";
+	}
+
+	this.callFlash("SetButtonDimensions", [width, height]);
+};
+// Public: setButtonText Changes the text overlaid on the button
+SWFUpload.prototype.setButtonText = function (html) {
+	this.settings.button_text = html;
+	this.callFlash("SetButtonText", [html]);
+};
+// Public: setButtonTextPadding changes the top and left padding of the text overlay
+SWFUpload.prototype.setButtonTextPadding = function (left, top) {
+	this.settings.button_text_top_padding = top;
+	this.settings.button_text_left_padding = left;
+	this.callFlash("SetButtonTextPadding", [left, top]);
+};
+
+// Public: setButtonTextStyle changes the CSS used to style the HTML/Text overlaid on the button
+SWFUpload.prototype.setButtonTextStyle = function (css) {
+	this.settings.button_text_style = css;
+	this.callFlash("SetButtonTextStyle", [css]);
+};
+// Public: setButtonDisabled disables/enables the button
+SWFUpload.prototype.setButtonDisabled = function (isDisabled) {
+	this.settings.button_disabled = isDisabled;
+	this.callFlash("SetButtonDisabled", [isDisabled]);
+};
+// Public: setButtonAction sets the action that occurs when the button is clicked
+SWFUpload.prototype.setButtonAction = function (buttonAction) {
+	this.settings.button_action = buttonAction;
+	this.callFlash("SetButtonAction", [buttonAction]);
+};
+
+// Public: setButtonCursor changes the mouse cursor displayed when hovering over the button
+SWFUpload.prototype.setButtonCursor = function (cursor) {
+	this.settings.button_cursor = cursor;
+	this.callFlash("SetButtonCursor", [cursor]);
+};
+
+/* *******************************
+	Flash Event Interfaces
+	These functions are used by Flash to trigger the various
+	events.
+
+	All these functions a Private.
+
+	Because the ExternalInterface library is buggy the event calls
+	are added to a queue and the queue then executed by a setTimeout.
+	This ensures that events are executed in a determinate order and that
+	the ExternalInterface bugs are avoided.
+******************************* */
+
+SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+
+	if (argumentArray == undefined) {
+		argumentArray = [];
+	} else if (!(argumentArray instanceof Array)) {
+		argumentArray = [argumentArray];
+	}
+
+	var self = this;
+	if (typeof this.settings[handlerName] === "function") {
+		// Queue the event
+		this.eventQueue.push(function () {
+			this.settings[handlerName].apply(this, argumentArray);
+		});
+
+		// Execute the next queued event
+		setTimeout(function () {
+			self.executeNextEvent();
+		}, 0);
+
+	} else if (this.settings[handlerName] !== null) {
+		throw "Event handler " + handlerName + " is unknown or is not a function";
+	}
+};
+
+// Private: Causes the next event in the queue to be executed.  Since events are queued using a setTimeout
+// we must queue them in order to garentee that they are executed in order.
+SWFUpload.prototype.executeNextEvent = function () {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+
+	var  f = this.eventQueue ? this.eventQueue.shift() : null;
+	if (typeof(f) === "function") {
+		f.apply(this);
+	}
+};
+
+// Private: unescapeFileParams is part of a workaround for a flash bug where objects passed through ExternalInterface cannot have
+// properties that contain characters that are not valid for JavaScript identifiers. To work around this
+// the Flash Component escapes the parameter names and we must unescape again before passing them along.
+SWFUpload.prototype.unescapeFilePostParams = function (file) {
+	var reg = /[$]([0-9a-f]{4})/i;
+	var unescapedPost = {};
+	var uk;
+
+	if (file != undefined) {
+		for (var k in file.post) {
+			if (file.post.hasOwnProperty(k)) {
+				uk = k;
+				var match;
+				while ((match = reg.exec(uk)) !== null) {
+					uk = uk.replace(match[0], String.fromCharCode(parseInt("0x" + match[1], 16)));
+				}
+				unescapedPost[uk] = file.post[k];
+			}
+		}
+
+		file.post = unescapedPost;
+	}
+
+	return file;
+};
+
+// Private: Called by Flash to see if JS can call in to Flash (test if External Interface is working)
+SWFUpload.prototype.testExternalInterface = function () {
+	try {
+		return this.callFlash("TestExternalInterface");
+	} catch (ex) {
+		return false;
+	}
+};
+
+// Private: This event is called by Flash when it has finished loading. Don't modify this.
+// Use the swfupload_loaded_handler event setting to execute custom code when SWFUpload has loaded.
+SWFUpload.prototype.flashReady = function () {
+	// Check that the movie element is loaded correctly with its ExternalInterface methods defined
+	var movieElement = this.getMovieElement();
+
+	if (!movieElement) {
+		this.debug("Flash called back ready but the flash movie can't be found.");
+		return;
+	}
+
+	this.cleanUp(movieElement);
+
+	this.queueEvent("swfupload_loaded_handler");
+};
+
+// Private: removes Flash added fuctions to the DOM node to prevent memory leaks in IE.
+// This function is called by Flash each time the ExternalInterface functions are created.
+SWFUpload.prototype.cleanUp = function (movieElement) {
+	// Pro-actively unhook all the Flash functions
+	try {
+		if (this.movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
+			this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");
+			for (var key in movieElement) {
+				try {
+					if (typeof(movieElement[key]) === "function") {
+						movieElement[key] = null;
+					}
+				} catch (ex) {
+				}
+			}
+		}
+	} catch (ex1) {
+
+	}
+
+	// Fix Flashes own cleanup code so if the SWFMovie was removed from the page
+	// it doesn't display errors.
+	window["__flash__removeCallback"] = function (instance, name) {
+		try {
+			if (instance) {
+				instance[name] = null;
+			}
+		} catch (flashEx) {
+
+		}
+	};
+
+};
+
+
+/* This is a chance to do something before the browse window opens */
+SWFUpload.prototype.fileDialogStart = function () {
+	this.queueEvent("file_dialog_start_handler");
+};
+
+
+/* Called when a file is successfully added to the queue. */
+SWFUpload.prototype.fileQueued = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queued_handler", file);
+};
+
+
+/* Handle errors that occur when an attempt to queue a file fails. */
+SWFUpload.prototype.fileQueueError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queue_error_handler", [file, errorCode, message]);
+};
+
+/* Called after the file dialog has closed and the selected files have been queued.
+	You could call startUpload here if you want the queued files to begin uploading immediately. */
+SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued, numFilesInQueue) {
+	this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued, numFilesInQueue]);
+};
+
+SWFUpload.prototype.uploadStart = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("return_upload_start_handler", file);
+};
+
+SWFUpload.prototype.returnUploadStart = function (file) {
+	var returnValue;
+	if (typeof this.settings.upload_start_handler === "function") {
+		file = this.unescapeFilePostParams(file);
+		returnValue = this.settings.upload_start_handler.call(this, file);
+	} else if (this.settings.upload_start_handler != undefined) {
+		throw "upload_start_handler must be a function";
+	}
+
+	// Convert undefined to true so if nothing is returned from the upload_start_handler it is
+	// interpretted as 'true'.
+	if (returnValue === undefined) {
+		returnValue = true;
+	}
+
+	returnValue = !!returnValue;
+
+	this.callFlash("ReturnUploadStart", [returnValue]);
+};
+
+
+
+SWFUpload.prototype.uploadProgress = function (file, bytesComplete, bytesTotal) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_progress_handler", [file, bytesComplete, bytesTotal]);
+};
+
+SWFUpload.prototype.uploadError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_error_handler", [file, errorCode, message]);
+};
+
+SWFUpload.prototype.uploadSuccess = function (file, serverData, responseReceived) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_success_handler", [file, serverData, responseReceived]);
+};
+
+SWFUpload.prototype.uploadComplete = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_complete_handler", file);
+};
+
+/* Called by SWFUpload JavaScript and Flash functions when debug is enabled. By default it writes messages to the
+   internal debug console.  You can override this event and have messages written where you want. */
+SWFUpload.prototype.debug = function (message) {
+	this.queueEvent("debug_handler", message);
+};
+
+
+/* **********************************
+	Debug Console
+	The debug console is a self contained, in page location
+	for debug message to be sent.  The Debug Console adds
+	itself to the body if necessary.
+
+	The console is automatically scrolled as messages appear.
+
+	If you are using your own debug handler or when you deploy to production and
+	have debug disabled you can remove these functions to reduce the file size
+	and complexity.
+********************************** */
+
+// Private: debugMessage is the default debug_handler.  If you want to print debug messages
+// call the debug() function.  When overriding the function your own function should
+// check to see if the debug setting is true before outputting debug information.
+SWFUpload.prototype.debugMessage = function (message) {
+	if (this.settings.debug) {
+		var exceptionMessage, exceptionValues = [];
+
+		// Check for an exception object and print it nicely
+		if (typeof message === "object" && typeof message.name === "string" && typeof message.message === "string") {
+			for (var key in message) {
+				if (message.hasOwnProperty(key)) {
+					exceptionValues.push(key + ": " + message[key]);
+				}
+			}
+			exceptionMessage = exceptionValues.join("\n") || "";
+			exceptionValues = exceptionMessage.split("\n");
+			exceptionMessage = "EXCEPTION: " + exceptionValues.join("\nEXCEPTION: ");
+			SWFUpload.Console.writeLine(exceptionMessage);
+		} else {
+			SWFUpload.Console.writeLine(message);
+		}
+	}
+};
+
+SWFUpload.Console = {};
+SWFUpload.Console.writeLine = function (message) {
+	var console, documentForm;
+
+	try {
+		console = document.getElementById("SWFUpload_Console");
+
+		if (!console) {
+			documentForm = document.createElement("form");
+			document.getElementsByTagName("body")[0].appendChild(documentForm);
+
+			console = document.createElement("textarea");
+			console.id = "SWFUpload_Console";
+			console.style.fontFamily = "monospace";
+			console.setAttribute("wrap", "off");
+			console.wrap = "off";
+			console.style.overflow = "auto";
+			console.style.width = "700px";
+			console.style.height = "350px";
+			console.style.margin = "5px";
+			documentForm.appendChild(console);
+		}
+
+		console.value += message + "\n";
+
+		console.scrollTop = console.scrollHeight - console.clientHeight;
+	} catch (ex) {
+		alert("Exception: " + ex.name + " Message: " + ex.message);
+	}
+};
+
+})();
+
+(function() {
+/*
+	Queue Plug-in
+
+	Features:
+		*Adds a cancelQueue() method for cancelling the entire queue.
+		*All queued files are uploaded when startUpload() is called.
+		*If false is returned from uploadComplete then the queue upload is stopped.
+		 If false is not returned (strict comparison) then the queue upload is continued.
+		*Adds a QueueComplete event that is fired when all the queued files have finished uploading.
+		 Set the event handler with the queue_complete_handler setting.
+
+	*/
+
+if (typeof(SWFUpload) === "function") {
+	SWFUpload.queue = {};
+
+	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
+		return function () {
+			if (typeof(oldInitSettings) === "function") {
+				oldInitSettings.call(this);
+			}
+
+			this.queueSettings = {};
+
+			this.queueSettings.queue_cancelled_flag = false;
+			this.queueSettings.queue_upload_count = 0;
+
+			this.queueSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
+			this.queueSettings.user_upload_start_handler = this.settings.upload_start_handler;
+			this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
+			this.settings.upload_start_handler = SWFUpload.queue.uploadStartHandler;
+
+			this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
+		};
+	})(SWFUpload.prototype.initSettings);
+
+	SWFUpload.prototype.startUpload = function (fileID) {
+		this.queueSettings.queue_cancelled_flag = false;
+		this.callFlash("StartUpload", [fileID]);
+	};
+
+	SWFUpload.prototype.cancelQueue = function () {
+		this.queueSettings.queue_cancelled_flag = true;
+		this.stopUpload();
+
+		var stats = this.getStats();
+		while (stats.files_queued > 0) {
+			this.cancelUpload();
+			stats = this.getStats();
+		}
+	};
+
+	SWFUpload.queue.uploadStartHandler = function (file) {
+		var returnValue;
+		if (typeof(this.queueSettings.user_upload_start_handler) === "function") {
+			returnValue = this.queueSettings.user_upload_start_handler.call(this, file);
+		}
+
+		// To prevent upload a real "FALSE" value must be returned, otherwise default to a real "TRUE" value.
+		returnValue = (returnValue === false) ? false : true;
+
+		this.queueSettings.queue_cancelled_flag = !returnValue;
+
+		return returnValue;
+	};
+
+	SWFUpload.queue.uploadCompleteHandler = function (file) {
+		var user_upload_complete_handler = this.queueSettings.user_upload_complete_handler;
+		var continueUpload;
+
+		if (file.filestatus === SWFUpload.FILE_STATUS.COMPLETE) {
+			this.queueSettings.queue_upload_count++;
+		}
+
+		if (typeof(user_upload_complete_handler) === "function") {
+			continueUpload = (user_upload_complete_handler.call(this, file) === false) ? false : true;
+		} else if (file.filestatus === SWFUpload.FILE_STATUS.QUEUED) {
+			// If the file was stopped and re-queued don't restart the upload
+			continueUpload = false;
+		} else {
+			continueUpload = true;
+		}
+
+		if (continueUpload) {
+			var stats = this.getStats();
+			if (stats.files_queued > 0 && this.queueSettings.queue_cancelled_flag === false) {
+				this.startUpload();
+			} else if (this.queueSettings.queue_cancelled_flag === false) {
+				this.queueEvent("queue_complete_handler", [this.queueSettings.queue_upload_count]);
+				this.queueSettings.queue_upload_count = 0;
+			} else {
+				this.queueSettings.queue_cancelled_flag = false;
+				this.queueSettings.queue_upload_count = 0;
+			}
+		}
+	};
+}
+
+})();
diff --git a/public/assets/kindeditor/plugins/pagebreak/pagebreak.js b/public/assets/kindeditor/plugins/pagebreak/pagebreak.js
new file mode 100644
index 000000000..dfa883afc
--- /dev/null
+++ b/public/assets/kindeditor/plugins/pagebreak/pagebreak.js
@@ -0,0 +1,27 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('pagebreak', function(K) {
+	var self = this;
+	var name = 'pagebreak';
+	var pagebreakHtml = K.undef(self.pagebreakHtml, '<hr style="page-break-after: always;" class="ke-pagebreak" />');
+
+	self.clickToolbar(name, function() {
+		var cmd = self.cmd, range = cmd.range;
+		self.focus();
+		var tail = self.newlineTag == 'br' || K.WEBKIT ? '' : '<span id="__kindeditor_tail_tag__"></span>';
+		self.insertHtml(pagebreakHtml + tail);
+		if (tail !== '') {
+			var p = K('#__kindeditor_tail_tag__', self.edit.doc);
+			range.selectNodeContents(p[0]);
+			p.removeAttr('id');
+			cmd.select();
+		}
+	});
+});
diff --git a/public/assets/kindeditor/plugins/plainpaste/plainpaste.js b/public/assets/kindeditor/plugins/plainpaste/plainpaste.js
new file mode 100644
index 000000000..8f7bed803
--- /dev/null
+++ b/public/assets/kindeditor/plugins/plainpaste/plainpaste.js
@@ -0,0 +1,41 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('plainpaste', function(K) {
+	var self = this, name = 'plainpaste';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<div style="margin-bottom:10px;">' + lang.comment + '</div>' +
+				'<textarea class="ke-textarea" style="width:408px;height:260px;"></textarea>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var html = textarea.val();
+						html = K.escape(html);
+						html = html.replace(/ {2}/g, ' &nbsp;');
+						if (self.newlineTag == 'p') {
+							html = html.replace(/^/, '<p>').replace(/$/, '</p>').replace(/\n/g, '</p><p>');
+						} else {
+							html = html.replace(/\n/g, '<br />$&');
+						}
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			textarea = K('textarea', dialog.div);
+		textarea[0].focus();
+	});
+});
diff --git a/public/assets/kindeditor/plugins/preview/preview.js b/public/assets/kindeditor/plugins/preview/preview.js
new file mode 100644
index 000000000..ef6e2cf16
--- /dev/null
+++ b/public/assets/kindeditor/plugins/preview/preview.js
@@ -0,0 +1,31 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('preview', function(K) {
+	var self = this, name = 'preview', undefined;
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<iframe class="ke-textarea" frameborder="0" style="width:708px;height:400px;"></iframe>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 750,
+				title : self.lang(name),
+				body : html
+			}),
+			iframe = K('iframe', dialog.div),
+			doc = K.iframeDoc(iframe);
+		doc.open();
+		doc.write(self.fullHtml());
+		doc.close();
+		K(doc.body).css('background-color', '#FFF');
+		iframe[0].contentWindow.focus();
+	});
+});
diff --git a/public/assets/kindeditor/plugins/quickformat/quickformat.js b/public/assets/kindeditor/plugins/quickformat/quickformat.js
new file mode 100644
index 000000000..5b98c7227
--- /dev/null
+++ b/public/assets/kindeditor/plugins/quickformat/quickformat.js
@@ -0,0 +1,81 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('quickformat', function(K) {
+	var self = this, name = 'quickformat',
+		blockMap = K.toMap('blockquote,center,div,h1,h2,h3,h4,h5,h6,p');
+	function getFirstChild(knode) {
+		var child = knode.first();
+		while (child && child.first()) {
+			child = child.first();
+		}
+		return child;
+	}
+	self.clickToolbar(name, function() {
+		self.focus();
+		var doc = self.edit.doc,
+			range = self.cmd.range,
+			child = K(doc.body).first(), next,
+			nodeList = [], subList = [],
+			bookmark = range.createBookmark(true);
+		while(child) {
+			next = child.next();
+			var firstChild = getFirstChild(child);
+			if (!firstChild || firstChild.name != 'img') {
+				if (blockMap[child.name]) {
+					child.html(child.html().replace(/^(\s|&nbsp;|　)+/ig, ''));
+					child.css('text-indent', '2em');
+				} else {
+					subList.push(child);
+				}
+				if (!next || (blockMap[next.name] || blockMap[child.name] && !blockMap[next.name])) {
+					if (subList.length > 0) {
+						nodeList.push(subList);
+					}
+					subList = [];
+				}
+			}
+			child = next;
+		}
+		K.each(nodeList, function(i, subList) {
+			var wrapper = K('<p style="text-indent:2em;"></p>', doc);
+			subList[0].before(wrapper);
+			K.each(subList, function(i, knode) {
+				wrapper.append(knode);
+			});
+		});
+		range.moveToBookmark(bookmark);
+		self.addBookmark();
+	});
+});
+
+/**
+--------------------------
+abcd<br />
+1234<br />
+
+to
+
+<p style="text-indent:2em;">
+	abcd<br />
+	1234<br />
+</p>
+
+--------------------------
+
+&nbsp; abcd<img>1233
+<p>1234</p>
+
+to
+
+<p style="text-indent:2em;">abcd<img>1233</p>
+<p style="text-indent:2em;">1234</p>
+
+--------------------------
+*/
\ No newline at end of file
diff --git a/public/assets/kindeditor/plugins/table/table.js b/public/assets/kindeditor/plugins/table/table.js
new file mode 100644
index 000000000..4033b6ae3
--- /dev/null
+++ b/public/assets/kindeditor/plugins/table/table.js
@@ -0,0 +1,712 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('table', function(K) {
+	var self = this, name = 'table', lang = self.lang(name + '.'), zeroborder = 'ke-zeroborder';
+	// 设置颜色
+	function _setColor(box, color) {
+		color = color.toUpperCase();
+		box.css('background-color', color);
+		box.css('color', color === '#000000' ? '#FFFFFF' : '#000000');
+		box.html(color);
+	}
+	// 初始化取色器
+	var pickerList = [];
+	function _initColorPicker(dialogDiv, colorBox) {
+		colorBox.bind('click,mousedown', function(e){
+			e.stopPropagation();
+		});
+		function removePicker() {
+			K.each(pickerList, function() {
+				this.remove();
+			});
+			pickerList = [];
+			K(document).unbind('click,mousedown', removePicker);
+			dialogDiv.unbind('click,mousedown', removePicker);
+		}
+		colorBox.click(function(e) {
+			removePicker();
+			var box = K(this),
+				pos = box.pos();
+			var picker = K.colorpicker({
+				x : pos.x,
+				y : pos.y + box.height(),
+				z : 811214,
+				selectedColor : K(this).html(),
+				colors : self.colorTable,
+				noColor : self.lang('noColor'),
+				shadowMode : self.shadowMode,
+				click : function(color) {
+					_setColor(box, color);
+					removePicker();
+				}
+			});
+			pickerList.push(picker);
+			K(document).bind('click,mousedown', removePicker);
+			dialogDiv.bind('click,mousedown', removePicker);
+		});
+	}
+	// 取得下一行cell的index
+	function _getCellIndex(table, row, cell) {
+		var rowSpanCount = 0;
+		for (var i = 0, len = row.cells.length; i < len; i++) {
+			if (row.cells[i] == cell) {
+				break;
+			}
+			rowSpanCount += row.cells[i].rowSpan - 1;
+		}
+		return cell.cellIndex - rowSpanCount;
+	}
+	self.plugin.table = {
+		//insert or modify table
+		prop : function(isInsert) {
+			var html = [
+				'<div style="padding:20px;">',
+				//rows, cols
+				'<div class="ke-dialog-row">',
+				'<label for="keRows" style="width:90px;">' + lang.cells + '</label>',
+				lang.rows + ' <input type="text" id="keRows" class="ke-input-text ke-input-number" name="rows" value="" maxlength="4" /> &nbsp; ',
+				lang.cols + ' <input type="text" class="ke-input-text ke-input-number" name="cols" value="" maxlength="4" />',
+				'</div>',
+				//width, height
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:90px;">' + lang.size + '</label>',
+				lang.width + ' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ',
+				'<select name="widthType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select> &nbsp; ',
+				lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ',
+				'<select name="heightType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select>',
+				'</div>',
+				//space, padding
+				'<div class="ke-dialog-row">',
+				'<label for="kePadding" style="width:90px;">' + lang.space + '</label>',
+				lang.padding + ' <input type="text" id="kePadding" class="ke-input-text ke-input-number" name="padding" value="" maxlength="4" /> &nbsp; ',
+				lang.spacing + ' <input type="text" class="ke-input-text ke-input-number" name="spacing" value="" maxlength="4" />',
+				'</div>',
+				//align
+				'<div class="ke-dialog-row">',
+				'<label for="keAlign" style="width:90px;">' + lang.align + '</label>',
+				'<select id="keAlign" name="align">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="left">' + lang.alignLeft + '</option>',
+				'<option value="center">' + lang.alignCenter + '</option>',
+				'<option value="right">' + lang.alignRight + '</option>',
+				'</select>',
+				'</div>',
+				//border
+				'<div class="ke-dialog-row">',
+				'<label for="keBorder" style="width:90px;">' + lang.border + '</label>',
+				lang.borderWidth + ' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',
+				lang.borderColor + ' <span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				//background color
+				'<div class="ke-dialog-row">',
+				'<label for="keBgColor" style="width:90px;">' + lang.backgroundColor + '</label>',
+				'<span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				'</div>'
+			].join('');
+			var bookmark = self.cmd.range.createBookmark();
+			var dialog = self.createDialog({
+				name : name,
+				width : 500,
+				title : self.lang(name),
+				body : html,
+				beforeRemove : function() {
+					colorBox.unbind();
+				},
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var rows = rowsBox.val(),
+							cols = colsBox.val(),
+							width = widthBox.val(),
+							height = heightBox.val(),
+							widthType = widthTypeBox.val(),
+							heightType = heightTypeBox.val(),
+							padding = paddingBox.val(),
+							spacing = spacingBox.val(),
+							align = alignBox.val(),
+							border = borderBox.val(),
+							borderColor = K(colorBox[0]).html() || '',
+							bgColor = K(colorBox[1]).html() || '';
+						if (rows == 0 || !/^\d+$/.test(rows)) {
+							alert(self.lang('invalidRows'));
+							rowsBox[0].focus();
+							return;
+						}
+						if (cols == 0 || !/^\d+$/.test(cols)) {
+							alert(self.lang('invalidRows'));
+							colsBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(padding)) {
+							alert(self.lang('invalidPadding'));
+							paddingBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(spacing)) {
+							alert(self.lang('invalidSpacing'));
+							spacingBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(border)) {
+							alert(self.lang('invalidBorder'));
+							borderBox[0].focus();
+							return;
+						}
+						//modify table
+						if (table) {
+							if (width !== '') {
+								table.width(width + widthType);
+							} else {
+								table.css('width', '');
+							}
+							if (table[0].width !== undefined) {
+								table.removeAttr('width');
+							}
+							if (height !== '') {
+								table.height(height + heightType);
+							} else {
+								table.css('height', '');
+							}
+							if (table[0].height !== undefined) {
+								table.removeAttr('height');
+							}
+							table.css('background-color', bgColor);
+							if (table[0].bgColor !== undefined) {
+								table.removeAttr('bgColor');
+							}
+							if (padding !== '') {
+								table[0].cellPadding = padding;
+							} else {
+								table.removeAttr('cellPadding');
+							}
+							if (spacing !== '') {
+								table[0].cellSpacing = spacing;
+							} else {
+								table.removeAttr('cellSpacing');
+							}
+							if (align !== '') {
+								table[0].align = align;
+							} else {
+								table.removeAttr('align');
+							}
+							if (border !== '') {
+								table.attr('border', border);
+							} else {
+								table.removeAttr('border');
+							}
+							if (border === '' || border === '0') {
+								table.addClass(zeroborder);
+							} else {
+								table.removeClass(zeroborder);
+							}
+							if (borderColor !== '') {
+								table.attr('borderColor', borderColor);
+							} else {
+								table.removeAttr('borderColor');
+							}
+							self.hideDialog().focus();
+							self.cmd.range.moveToBookmark(bookmark);
+							self.cmd.select();
+							self.addBookmark();
+							return;
+						}
+						//insert new table
+						var style = '';
+						if (width !== '') {
+							style += 'width:' + width + widthType + ';';
+						}
+						if (height !== '') {
+							style += 'height:' + height + heightType + ';';
+						}
+						if (bgColor !== '') {
+							style += 'background-color:' + bgColor + ';';
+						}
+						var html = '<table';
+						if (style !== '') {
+							html += ' style="' + style + '"';
+						}
+						if (padding !== '') {
+							html += ' cellpadding="' + padding + '"';
+						}
+						if (spacing !== '') {
+							html += ' cellspacing="' + spacing + '"';
+						}
+						if (align !== '') {
+							html += ' align="' + align + '"';
+						}
+						if (border !== '') {
+							html += ' border="' + border + '"';
+						}
+						if (border === '' || border === '0') {
+							html += ' class="' + zeroborder + '"';
+						}
+						if (borderColor !== '') {
+							html += ' bordercolor="' + borderColor + '"';
+						}
+						html += '>';
+						for (var i = 0; i < rows; i++) {
+							html += '<tr>';
+							for (var j = 0; j < cols; j++) {
+								html += '<td>' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
+							}
+							html += '</tr>';
+						}
+						html += '</table>';
+						if (!K.IE) {
+							html += '<br />';
+						}
+						self.insertHtml(html);
+						self.select().hideDialog().focus();
+						self.addBookmark();
+					}
+				}
+			}),
+			div = dialog.div,
+			rowsBox = K('[name="rows"]', div).val(3),
+			colsBox = K('[name="cols"]', div).val(2),
+			widthBox = K('[name="width"]', div).val(100),
+			heightBox = K('[name="height"]', div),
+			widthTypeBox = K('[name="widthType"]', div),
+			heightTypeBox = K('[name="heightType"]', div),
+			paddingBox = K('[name="padding"]', div).val(2),
+			spacingBox = K('[name="spacing"]', div).val(0),
+			alignBox = K('[name="align"]', div),
+			borderBox = K('[name="border"]', div).val(1),
+			colorBox = K('.ke-input-color', div);
+			_initColorPicker(div, colorBox.eq(0));
+			_initColorPicker(div, colorBox.eq(1));
+			_setColor(colorBox.eq(0), '#000000');
+			_setColor(colorBox.eq(1), '');
+			// foucs and select
+			rowsBox[0].focus();
+			rowsBox[0].select();
+			var table;
+			if (isInsert) {
+				return;
+			}
+			//get selected table node
+			table = self.plugin.getSelectedTable();
+			if (table) {
+				rowsBox.val(table[0].rows.length);
+				colsBox.val(table[0].rows.length > 0 ? table[0].rows[0].cells.length : 0);
+				rowsBox.attr('disabled', true);
+				colsBox.attr('disabled', true);
+				var match,
+					tableWidth = table[0].style.width || table[0].width,
+					tableHeight = table[0].style.height || table[0].height;
+				if (tableWidth !== undefined && (match = /^(\d+)((?:px|%)*)$/.exec(tableWidth))) {
+					widthBox.val(match[1]);
+					widthTypeBox.val(match[2]);
+				} else {
+					widthBox.val('');
+				}
+				if (tableHeight !== undefined && (match = /^(\d+)((?:px|%)*)$/.exec(tableHeight))) {
+					heightBox.val(match[1]);
+					heightTypeBox.val(match[2]);
+				}
+				paddingBox.val(table[0].cellPadding || '');
+				spacingBox.val(table[0].cellSpacing || '');
+				alignBox.val(table[0].align || '');
+				borderBox.val(table[0].border === undefined ? '' : table[0].border);
+				_setColor(colorBox.eq(0), K.toHex(table.attr('borderColor') || ''));
+				_setColor(colorBox.eq(1), K.toHex(table[0].style.backgroundColor || table[0].bgColor || ''));
+				widthBox[0].focus();
+				widthBox[0].select();
+			}
+		},
+		//modify cell
+		cellprop : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//width, height
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:90px;">' + lang.size + '</label>',
+				lang.width + ' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ',
+				'<select name="widthType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select> &nbsp; ',
+				lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ',
+				'<select name="heightType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select>',
+				'</div>',
+				//align
+				'<div class="ke-dialog-row">',
+				'<label for="keAlign" style="width:90px;">' + lang.align + '</label>',
+				lang.textAlign + ' <select id="keAlign" name="textAlign">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="left">' + lang.alignLeft + '</option>',
+				'<option value="center">' + lang.alignCenter + '</option>',
+				'<option value="right">' + lang.alignRight + '</option>',
+				'</select> ',
+				lang.verticalAlign + ' <select name="verticalAlign">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="top">' + lang.alignTop + '</option>',
+				'<option value="middle">' + lang.alignMiddle + '</option>',
+				'<option value="bottom">' + lang.alignBottom + '</option>',
+				'<option value="baseline">' + lang.alignBaseline + '</option>',
+				'</select>',
+				'</div>',
+				//border
+				'<div class="ke-dialog-row">',
+				'<label for="keBorder" style="width:90px;">' + lang.border + '</label>',
+				lang.borderWidth + ' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',
+				lang.borderColor + ' <span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				//background color
+				'<div class="ke-dialog-row">',
+				'<label for="keBgColor" style="width:90px;">' + lang.backgroundColor + '</label>',
+				'<span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				'</div>'
+			].join('');
+			var bookmark = self.cmd.range.createBookmark();
+			var dialog = self.createDialog({
+				name : name,
+				width : 500,
+				title : self.lang('tablecell'),
+				body : html,
+				beforeRemove : function() {
+					colorBox.unbind();
+				},
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var width = widthBox.val(),
+							height = heightBox.val(),
+							widthType = widthTypeBox.val(),
+							heightType = heightTypeBox.val(),
+							padding = paddingBox.val(),
+							spacing = spacingBox.val(),
+							textAlign = textAlignBox.val(),
+							verticalAlign = verticalAlignBox.val(),
+							border = borderBox.val(),
+							borderColor = K(colorBox[0]).html() || '',
+							bgColor = K(colorBox[1]).html() || '';
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(border)) {
+							alert(self.lang('invalidBorder'));
+							borderBox[0].focus();
+							return;
+						}
+						cell.css({
+							width : width !== '' ? (width + widthType) : '',
+							height : height !== '' ? (height + heightType) : '',
+							'background-color' : bgColor,
+							'text-align' : textAlign,
+							'vertical-align' : verticalAlign,
+							'border-width' : border,
+							'border-style' : border !== '' ? 'solid' : '',
+							'border-color' : borderColor
+						});
+						self.hideDialog().focus();
+						self.cmd.range.moveToBookmark(bookmark);
+						self.cmd.select();
+						self.addBookmark();
+					}
+				}
+			}),
+			div = dialog.div,
+			widthBox = K('[name="width"]', div).val(100),
+			heightBox = K('[name="height"]', div),
+			widthTypeBox = K('[name="widthType"]', div),
+			heightTypeBox = K('[name="heightType"]', div),
+			paddingBox = K('[name="padding"]', div).val(2),
+			spacingBox = K('[name="spacing"]', div).val(0),
+			textAlignBox = K('[name="textAlign"]', div),
+			verticalAlignBox = K('[name="verticalAlign"]', div),
+			borderBox = K('[name="border"]', div).val(1),
+			colorBox = K('.ke-input-color', div);
+			_initColorPicker(div, colorBox.eq(0));
+			_initColorPicker(div, colorBox.eq(1));
+			_setColor(colorBox.eq(0), '#000000');
+			_setColor(colorBox.eq(1), '');
+			// foucs and select
+			widthBox[0].focus();
+			widthBox[0].select();
+			// get selected cell
+			var cell = self.plugin.getSelectedCell();
+			var match,
+				cellWidth = cell[0].style.width || cell[0].width || '',
+				cellHeight = cell[0].style.height || cell[0].height || '';
+			if ((match = /^(\d+)((?:px|%)*)$/.exec(cellWidth))) {
+				widthBox.val(match[1]);
+				widthTypeBox.val(match[2]);
+			} else {
+				widthBox.val('');
+			}
+			if ((match = /^(\d+)((?:px|%)*)$/.exec(cellHeight))) {
+				heightBox.val(match[1]);
+				heightTypeBox.val(match[2]);
+			}
+			textAlignBox.val(cell[0].style.textAlign || '');
+			verticalAlignBox.val(cell[0].style.verticalAlign || '');
+			var border = cell[0].style.borderWidth || '';
+			if (border) {
+				border = parseInt(border);
+			}
+			borderBox.val(border);
+			_setColor(colorBox.eq(0), K.toHex(cell[0].style.borderColor || ''));
+			_setColor(colorBox.eq(1), K.toHex(cell[0].style.backgroundColor || ''));
+			widthBox[0].focus();
+			widthBox[0].select();
+		},
+		insert : function() {
+			this.prop(true);
+		},
+		'delete' : function() {
+			var table = self.plugin.getSelectedTable();
+			self.cmd.range.setStartBefore(table[0]).collapse(true);
+			self.cmd.select();
+			table.remove();
+			self.addBookmark();
+		},
+		colinsert : function(offset) {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				index = cell.cellIndex + offset;
+			// 取得第一行的index
+			index += table.rows[0].cells.length - row.cells.length;
+
+			for (var i = 0, len = table.rows.length; i < len; i++) {
+				var newRow = table.rows[i],
+					newCell = newRow.insertCell(index);
+				newCell.innerHTML = K.IE ? '' : '<br />';
+				// 调整下一行的单元格index
+				index = _getCellIndex(table, newRow, newCell);
+			}
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colinsertleft : function() {
+			this.colinsert(0);
+		},
+		colinsertright : function() {
+			this.colinsert(1);
+		},
+		rowinsert : function(offset) {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0];
+			var rowIndex = row.rowIndex;
+			if (offset === 1) {
+				rowIndex = row.rowIndex + (cell.rowSpan - 1) + offset;
+			}
+			var newRow = table.insertRow(rowIndex);
+
+			for (var i = 0, len = row.cells.length; i < len; i++) {
+				// 调整cell个数
+				if (row.cells[i].rowSpan > 1) {
+					len -= row.cells[i].rowSpan - 1;
+				}
+				var newCell = newRow.insertCell(i);
+				// copy colspan
+				if (offset === 1 && row.cells[i].colSpan > 1) {
+					newCell.colSpan = row.cells[i].colSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+			}
+			// 调整rowspan
+			for (var j = rowIndex; j >= 0; j--) {
+				var cells = table.rows[j].cells;
+				if (cells.length > i) {
+					for (var k = cell.cellIndex; k >= 0; k--) {
+						if (cells[k].rowSpan > 1) {
+							cells[k].rowSpan += 1;
+						}
+					}
+					break;
+				}
+			}
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		rowinsertabove : function() {
+			this.rowinsert(0);
+		},
+		rowinsertbelow : function() {
+			this.rowinsert(1);
+		},
+		rowmerge : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex, // 当前行的index
+				nextRowIndex = rowIndex + cell.rowSpan, // 下一行的index
+				nextRow = table.rows[nextRowIndex]; // 下一行
+			// 最后一行不能合并
+			if (table.rows.length <= nextRowIndex) {
+				return;
+			}
+			var cellIndex = cell.cellIndex; // 下一行单元格的index
+			if (nextRow.cells.length <= cellIndex) {
+				return;
+			}
+			var nextCell = nextRow.cells[cellIndex]; // 下一行单元格
+			// 上下行的colspan不一致时不能合并
+			if (cell.colSpan !== nextCell.colSpan) {
+				return;
+			}
+			cell.rowSpan += nextCell.rowSpan;
+			nextRow.deleteCell(cellIndex);
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colmerge : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex, // 当前行的index
+				cellIndex = cell.cellIndex,
+				nextCellIndex = cellIndex + 1;
+			// 最后一列不能合并
+			if (row.cells.length <= nextCellIndex) {
+				return;
+			}
+			var nextCell = row.cells[nextCellIndex];
+			// 左右列的rowspan不一致时不能合并
+			if (cell.rowSpan !== nextCell.rowSpan) {
+				return;
+			}
+			cell.colSpan += nextCell.colSpan;
+			row.deleteCell(nextCellIndex);
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		rowsplit : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex;
+			// 不是可分割单元格
+			if (cell.rowSpan === 1) {
+				return;
+			}
+			var cellIndex = _getCellIndex(table, row, cell);
+			for (var i = 1, len = cell.rowSpan; i < len; i++) {
+				var newRow = table.rows[rowIndex + i],
+					newCell = newRow.insertCell(cellIndex);
+				if (cell.colSpan > 1) {
+					newCell.colSpan = cell.colSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+				// 调整下一行的单元格index
+				cellIndex = _getCellIndex(table, newRow, newCell);
+			}
+			K(cell).removeAttr('rowSpan');
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colsplit : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				cellIndex = cell.cellIndex;
+			// 不是可分割单元格
+			if (cell.colSpan === 1) {
+				return;
+			}
+			for (var i = 1, len = cell.colSpan; i < len; i++) {
+				var newCell = row.insertCell(cellIndex + i);
+				if (cell.rowSpan > 1) {
+					newCell.rowSpan = cell.rowSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+			}
+			K(cell).removeAttr('colSpan');
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		coldelete : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				index = cell.cellIndex;
+			for (var i = 0, len = table.rows.length; i < len; i++) {
+				var newRow = table.rows[i],
+					newCell = newRow.cells[index];
+				if (newCell.colSpan > 1) {
+					newCell.colSpan -= 1;
+					if (newCell.colSpan === 1) {
+						K(newCell).removeAttr('colSpan');
+					}
+				} else {
+					newRow.deleteCell(index);
+				}
+				// 跳过不需要删除的行
+				if (newCell.rowSpan > 1) {
+					i += newCell.rowSpan - 1;
+				}
+			}
+			if (row.cells.length === 0) {
+				self.cmd.range.setStartBefore(table).collapse(true);
+				self.cmd.select();
+				K(table).remove();
+			} else {
+				self.cmd.selection(true);
+			}
+			self.addBookmark();
+		},
+		rowdelete : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex;
+			// 从下到上删除
+			for (var i = cell.rowSpan - 1; i >= 0; i--) {
+				table.deleteRow(rowIndex + i);
+			}
+			if (table.rows.length === 0) {
+				self.cmd.range.setStartBefore(table).collapse(true);
+				self.cmd.select();
+				K(table).remove();
+			} else {
+				self.cmd.selection(true);
+			}
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.table.prop);
+});
diff --git a/public/assets/kindeditor/plugins/template/html/1.html b/public/assets/kindeditor/plugins/template/html/1.html
new file mode 100644
index 000000000..034126b72
--- /dev/null
+++ b/public/assets/kindeditor/plugins/template/html/1.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+</head>
+<body>
+	<h3>
+		<img align="left" height="100" style="margin-right: 10px" width="100" />在此处输入标题
+	</h3>
+	<p>
+		在此处输入内容
+	</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/public/assets/kindeditor/plugins/template/html/2.html b/public/assets/kindeditor/plugins/template/html/2.html
new file mode 100644
index 000000000..dc2584a0d
--- /dev/null
+++ b/public/assets/kindeditor/plugins/template/html/2.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+</head>
+<body>
+	<h3>
+		标题
+	</h3>
+	<table style="width:100%;" cellpadding="2" cellspacing="0" border="1">
+		<tbody>
+			<tr>
+				<td>
+					<h3>标题1</h3>
+				</td>
+				<td>
+					<h3>标题1</h3>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					内容1
+				</td>
+				<td>
+					内容2
+				</td>
+			</tr>
+			<tr>
+				<td>
+					内容3
+				</td>
+				<td>
+					内容4
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<p>
+		表格说明
+	</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/public/assets/kindeditor/plugins/template/html/3.html b/public/assets/kindeditor/plugins/template/html/3.html
new file mode 100644
index 000000000..873f0c65d
--- /dev/null
+++ b/public/assets/kindeditor/plugins/template/html/3.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+</head>
+<body>
+	<p>
+		在此处输入内容
+	</p>
+	<ol>
+		<li>
+			描述1
+		</li>
+		<li>
+			描述2
+		</li>
+		<li>
+			描述3
+		</li>
+	</ol>
+	<p>
+		在此处输入内容
+	</p>
+	<ul>
+		<li>
+			描述1
+		</li>
+		<li>
+			描述2
+		</li>
+		<li>
+			描述3
+		</li>
+	</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/public/assets/kindeditor/plugins/template/template.js b/public/assets/kindeditor/plugins/template/template.js
new file mode 100644
index 000000000..4029e8716
--- /dev/null
+++ b/public/assets/kindeditor/plugins/template/template.js
@@ -0,0 +1,58 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('template', function(K) {
+	var self = this, name = 'template', lang = self.lang(name + '.'),
+		htmlPath = self.pluginsPath + name + '/html/';
+	function getFilePath(fileName) {
+		return htmlPath + fileName + '?ver=' + encodeURIComponent(K.DEBUG ? K.TIME : K.VERSION);
+	}
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			arr = ['<div style="padding:10px 20px;">',
+				'<div class="ke-header">',
+				// left start
+				'<div class="ke-left">',
+				lang. selectTemplate + ' <select>'];
+			K.each(lang.fileList, function(key, val) {
+				arr.push('<option value="' + key + '">' + val + '</option>');
+			});
+			html = [arr.join(''),
+				'</select></div>',
+				// right start
+				'<div class="ke-right">',
+				'<input type="checkbox" id="keReplaceFlag" name="replaceFlag" value="1" /> <label for="keReplaceFlag">' + lang.replaceContent + '</label>',
+				'</div>',
+				'<div class="ke-clearfix"></div>',
+				'</div>',
+				'<iframe class="ke-textarea" frameborder="0" style="width:458px;height:260px;background-color:#FFF;"></iframe>',
+				'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 500,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var doc = K.iframeDoc(iframe);
+					self[checkbox[0].checked ? 'html' : 'insertHtml'](doc.body.innerHTML).hideDialog().focus();
+				}
+			}
+		});
+		var selectBox = K('select', dialog.div),
+			checkbox = K('[name="replaceFlag"]', dialog.div),
+			iframe = K('iframe', dialog.div);
+		checkbox[0].checked = true;
+		iframe.attr('src', getFilePath(selectBox.val()));
+		selectBox.change(function() {
+			iframe.attr('src', getFilePath(this.value));
+		});
+	});
+});
diff --git a/public/assets/kindeditor/plugins/wordpaste/wordpaste.js b/public/assets/kindeditor/plugins/wordpaste/wordpaste.js
new file mode 100644
index 000000000..22061e15e
--- /dev/null
+++ b/public/assets/kindeditor/plugins/wordpaste/wordpaste.js
@@ -0,0 +1,51 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('wordpaste', function(K) {
+	var self = this, name = 'wordpaste';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<div style="margin-bottom:10px;">' + lang.comment + '</div>' +
+				'<iframe class="ke-textarea" frameborder="0" style="width:408px;height:260px;"></iframe>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var str = doc.body.innerHTML;
+						str = K.clearMsWord(str, self.filterMode ? self.htmlTags : K.options.htmlTags);
+						self.insertHtml(str).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			iframe = K('iframe', div),
+			doc = K.iframeDoc(iframe);
+		if (!K.IE) {
+			doc.designMode = 'on';
+		}
+		doc.open();
+		doc.write('<!doctype html><html><head><title>WordPaste</title></head>');
+		doc.write('<body style="background-color:#FFF;font-size:12px;margin:2px;">');
+		if (!K.IE) {
+			doc.write('<br />');
+		}
+		doc.write('</body></html>');
+		doc.close();
+		if (K.IE) {
+			doc.body.contentEditable = 'true';
+		}
+		iframe[0].contentWindow.focus();
+	});
+});
diff --git a/public/assets/kindeditor/themes/common/anchor.gif b/public/assets/kindeditor/themes/common/anchor.gif
new file mode 100644
index 000000000..61145ea78
Binary files /dev/null and b/public/assets/kindeditor/themes/common/anchor.gif differ
diff --git a/public/assets/kindeditor/themes/common/blank.gif b/public/assets/kindeditor/themes/common/blank.gif
new file mode 100644
index 000000000..5bfd67a2d
Binary files /dev/null and b/public/assets/kindeditor/themes/common/blank.gif differ
diff --git a/public/assets/kindeditor/themes/common/flash.gif b/public/assets/kindeditor/themes/common/flash.gif
new file mode 100644
index 000000000..2cb12b284
Binary files /dev/null and b/public/assets/kindeditor/themes/common/flash.gif differ
diff --git a/public/assets/kindeditor/themes/common/loading.gif b/public/assets/kindeditor/themes/common/loading.gif
new file mode 100644
index 000000000..c69e93723
Binary files /dev/null and b/public/assets/kindeditor/themes/common/loading.gif differ
diff --git a/public/assets/kindeditor/themes/common/media.gif b/public/assets/kindeditor/themes/common/media.gif
new file mode 100644
index 000000000..e1c0e30af
Binary files /dev/null and b/public/assets/kindeditor/themes/common/media.gif differ
diff --git a/public/assets/kindeditor/themes/common/rm.gif b/public/assets/kindeditor/themes/common/rm.gif
new file mode 100644
index 000000000..d013d551d
Binary files /dev/null and b/public/assets/kindeditor/themes/common/rm.gif differ
diff --git a/public/assets/kindeditor/themes/default/background.png b/public/assets/kindeditor/themes/default/background.png
new file mode 100644
index 000000000..bbfb056bd
Binary files /dev/null and b/public/assets/kindeditor/themes/default/background.png differ
diff --git a/public/assets/kindeditor/themes/default/default.css b/public/assets/kindeditor/themes/default/default.css
new file mode 100644
index 000000000..428b6c8b5
--- /dev/null
+++ b/public/assets/kindeditor/themes/default/default.css
@@ -0,0 +1,1149 @@
+/* common */
+.ke-inline-block {
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-clearfix {
+	zoom: 1;
+}
+.ke-clearfix:after {
+	content: ".";
+	display: block;
+	clear: both;
+	font-size: 0;
+	height: 0;
+	line-height: 0;
+	visibility: hidden;
+}
+.ke-shadow {
+	box-shadow: 1px 1px 3px #A0A0A0;
+	-moz-box-shadow: 1px 1px 3px #A0A0A0;
+	-webkit-box-shadow: 1px 1px 3px #A0A0A0;
+	filter: progid:DXImageTransform.Microsoft.Shadow(color='#A0A0A0', Direction=135, Strength=3);
+	background-color: #F0F0EE;
+}
+.ke-menu a,
+.ke-menu a:hover,
+.ke-dialog a,
+.ke-dialog a:hover {
+	color: #337FE5;
+	text-decoration: none;
+}
+/* icons */
+.ke-icon-source {
+	background-position: 0px 0px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-preview {
+	background-position: 0px -16px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-print {
+	background-position: 0px -32px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-undo {
+	background-position: 0px -48px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-redo {
+	background-position: 0px -64px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-cut {
+	background-position: 0px -80px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-copy {
+	background-position: 0px -96px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-paste {
+	background-position: 0px -112px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-selectall {
+	background-position: 0px -128px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifyleft {
+	background-position: 0px -144px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifycenter {
+	background-position: 0px -160px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifyright {
+	background-position: 0px -176px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifyfull {
+	background-position: 0px -192px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-insertorderedlist {
+	background-position: 0px -208px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-insertunorderedlist {
+	background-position: 0px -224px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-indent {
+	background-position: 0px -240px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-outdent {
+	background-position: 0px -256px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-subscript {
+	background-position: 0px -272px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-superscript {
+	background-position: 0px -288px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-date {
+	background-position: 0px -304px;
+	width: 25px;
+	height: 16px;
+}
+.ke-icon-time {
+	background-position: 0px -320px;
+	width: 25px;
+	height: 16px;
+}
+.ke-icon-formatblock {
+	background-position: 0px -336px;
+	width: 25px;
+	height: 16px;
+}
+.ke-icon-fontname {
+	background-position: 0px -352px;
+	width: 21px;
+	height: 16px;
+}
+.ke-icon-fontsize {
+	background-position: 0px -368px;
+	width: 23px;
+	height: 16px;
+}
+.ke-icon-forecolor {
+	background-position: 0px -384px;
+	width: 20px;
+	height: 16px;
+}
+.ke-icon-hilitecolor {
+	background-position: 0px -400px;
+	width: 23px;
+	height: 16px;
+}
+.ke-icon-bold {
+	background-position: 0px -416px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-italic {
+	background-position: 0px -432px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-underline {
+	background-position: 0px -448px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-strikethrough {
+	background-position: 0px -464px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-removeformat {
+	background-position: 0px -480px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-image {
+	background-position: 0px -496px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-flash {
+	background-position: 0px -512px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-media {
+	background-position: 0px -528px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-div {
+	background-position: 0px -544px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-formula {
+	background-position: 0px -576px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-hr {
+	background-position: 0px -592px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-emoticons {
+	background-position: 0px -608px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-link {
+	background-position: 0px -624px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-unlink {
+	background-position: 0px -640px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-fullscreen {
+	background-position: 0px -656px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-about {
+	background-position: 0px -672px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-plainpaste {
+	background-position: 0px -704px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-wordpaste {
+	background-position: 0px -720px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-table {
+	background-position: 0px -784px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablemenu {
+	background-position: 0px -768px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tableinsert {
+	background-position: 0px -784px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tabledelete {
+	background-position: 0px -800px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolinsertleft {
+	background-position: 0px -816px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolinsertright {
+	background-position: 0px -832px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowinsertabove {
+	background-position: 0px -848px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowinsertbelow {
+	background-position: 0px -864px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecoldelete {
+	background-position: 0px -880px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowdelete {
+	background-position: 0px -896px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecellprop {
+	background-position: 0px -912px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tableprop {
+	background-position: 0px -928px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-checked {
+	background-position: 0px -944px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-code {
+	background-position: 0px -960px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-map {
+	background-position: 0px -976px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-baidumap {
+	background-position: 0px -976px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-lineheight {
+	background-position: 0px -992px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-clearhtml {
+	background-position: 0px -1008px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-pagebreak {
+	background-position: 0px -1024px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-insertfile {
+	background-position: 0px -1040px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-quickformat {
+	background-position: 0px -1056px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-template {
+	background-position: 0px -1072px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecellsplit {
+	background-position: 0px -1088px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowmerge {
+	background-position: 0px -1104px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowsplit {
+	background-position: 0px -1120px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolmerge {
+	background-position: 0px -1136px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolsplit {
+	background-position: 0px -1152px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-anchor {
+	background-position: 0px -1168px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-search {
+	background-position: 0px -1184px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-new {
+	background-position: 0px -1200px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-specialchar {
+	background-position: 0px -1216px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-multiimage {
+	background-position: 0px -1232px;
+	width: 16px;
+	height: 16px;
+}
+/* container */
+.ke-container {
+	display: block;
+	border: 1px solid #CCCCCC;
+	background-color: #FFF;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+}
+/* toolbar */
+.ke-toolbar {
+	border-bottom: 1px solid #CCC;
+	background-color: #F0F0EE;
+	padding: 2px 5px;
+	text-align: left;
+	overflow: hidden;
+	zoom: 1;
+}
+.ke-toolbar-icon {
+	background-repeat: no-repeat;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	display: block;
+}
+.ke-toolbar-icon-url {
+	background-image: url(default.png);
+}
+.ke-toolbar .ke-outline {
+	border: 1px solid #F0F0EE;
+	margin: 1px;
+	padding: 1px 2px;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	cursor: pointer;
+	display: block;
+	float: left;
+}
+.ke-toolbar .ke-on {
+	border: 1px solid #5690D2;
+}
+.ke-toolbar .ke-selected {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-toolbar .ke-disabled {
+	cursor: default;
+}
+.ke-toolbar .ke-separator {
+	height: 16px;
+	margin: 2px 3px;
+	border-left: 1px solid #A0A0A0;
+	border-right: 1px solid #FFFFFF;
+	border-top:0;
+	border-bottom:0;
+	width: 0;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	display: block;
+	float: left;
+}
+.ke-toolbar .ke-hr {
+	overflow: hidden;
+	height: 1px;
+	clear: both;
+}
+/* edit */
+.ke-edit {
+	padding: 0;
+}
+.ke-edit-iframe,
+.ke-edit-textarea {
+	border: 0;
+	margin: 0;
+	padding: 0;
+	overflow: auto;
+}
+.ke-edit-textarea {
+	font: 12px/1.5 "Consolas", "Monaco", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;
+	color: #000;
+	overflow: auto;
+	resize: none;
+}
+.ke-edit-textarea:focus {
+	outline: none;
+}
+/* statusbar */
+.ke-statusbar {
+	position: relative;
+	background-color: #F0F0EE;
+	border-top: 1px solid #CCCCCC;
+	font-size: 0;
+	line-height: 0;
+	*height: 12px;
+	overflow: hidden;
+	text-align: center;
+	cursor: s-resize;
+}
+.ke-statusbar-center-icon {
+	background-position: -0px -754px;
+	width: 15px;
+	height: 11px;
+	background-image: url(default.png);
+}
+.ke-statusbar-right-icon {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	cursor: se-resize;
+	background-position: -5px -741px;
+	width: 11px;
+	height: 11px;
+	background-image: url(default.png);
+}
+/* menu */
+.ke-menu {
+	border: 1px solid #A0A0A0;
+	background-color: #F1F1F1;
+	color: #222222;
+	padding: 2px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	text-align: left;
+	overflow: hidden;
+}
+.ke-menu-item {
+	border: 1px solid #F1F1F1;
+	background-color: #F1F1F1;
+	color: #222222;
+	height: 24px;
+	overflow: hidden;
+	cursor: pointer;
+}
+.ke-menu-item-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-menu-item-left {
+	width: 27px;
+	text-align: center;
+	overflow: hidden;
+}
+.ke-menu-item-center {
+	width: 0;
+	height: 24px;
+	border-left: 1px solid #E3E3E3;
+	border-right: 1px solid #FFFFFF;
+	border-top: 0;
+	border-bottom: 0;
+}
+.ke-menu-item-center-on {
+	border-left: 1px solid #E9EFF6;
+	border-right: 1px solid #E9EFF6;
+}
+.ke-menu-item-right {
+	border: 0;
+	padding: 0 0 0 5px;
+	line-height: 24px;
+	text-align: left;
+	overflow: hidden;
+}
+.ke-menu-separator {
+	margin: 2px 0;
+	height: 0;
+	overflow: hidden;
+	border-top: 1px solid #CCCCCC;
+	border-bottom: 1px solid #FFFFFF;
+	border-left: 0;
+	border-right: 0;
+}
+/* colorpicker */
+.ke-colorpicker {
+	border: 1px solid #A0A0A0;
+	background-color: #F1F1F1;
+	color: #222222;
+	padding: 2px;
+}
+.ke-colorpicker-table {
+	border:0;
+	margin:0;
+	padding:0;
+	border-collapse: separate;
+}
+.ke-colorpicker-cell {
+	font-size: 0;
+	line-height: 0;
+	border: 1px solid #F0F0EE;
+	cursor: pointer;
+	margin:3px;
+	padding:0;
+}
+.ke-colorpicker-cell-top {
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	line-height: 24px;
+	border: 1px solid #F0F0EE;
+	cursor: pointer;
+	margin:0;
+	padding:0;
+	text-align: center;
+}
+.ke-colorpicker-cell-on {
+	border: 1px solid #5690D2;
+}
+.ke-colorpicker-cell-selected {
+	border: 1px solid #2446AB;
+}
+.ke-colorpicker-cell-color {
+	width: 14px;
+	height: 14px;
+	margin: 3px;
+	padding: 0;
+	border: 0;
+}
+/* dialog */
+.ke-dialog {
+	position: absolute;
+	margin: 0;
+	padding: 0;
+}
+.ke-dialog .ke-header {
+	width: 100%;
+	margin-bottom: 10px;
+}
+.ke-dialog .ke-header .ke-left {
+	float: left;
+}
+.ke-dialog .ke-header .ke-right {
+	float: right;
+}
+.ke-dialog .ke-header label {
+	margin-right: 0;
+	cursor: pointer;
+	font-weight: normal;
+	display: inline;
+	vertical-align: top;
+}
+.ke-dialog-content {
+	background-color: #FFF;
+	width: 100%;
+	height: 100%;
+	color: #333;
+	border: 1px solid #A0A0A0;
+}
+.ke-dialog-shadow {
+	position: absolute;
+	z-index: -1;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	box-shadow: 3px 3px 7px #999;
+	-moz-box-shadow: 3px 3px 7px #999;
+	-webkit-box-shadow: 3px 3px 7px #999;
+	filter: progid:DXImageTransform.Microsoft.Blur(PixelRadius='3', MakeShadow='true', ShadowOpacity='0.4');
+	background-color: #F0F0EE;
+}
+.ke-dialog-header {
+	border:0;
+	margin:0;
+	padding: 0 10px;
+	background: url(background.png) repeat scroll 0 0 #F0F0EE;
+	border-bottom: 1px solid #CFCFCF;
+	height: 24px;
+	font: 12px/24px "sans serif",tahoma,verdana,helvetica;
+	text-align: left;
+	color: #222;
+	cursor: move;
+}
+.ke-dialog-icon-close {
+	display: block;
+	background: url(default.png) no-repeat scroll 0px -688px;
+	width: 16px;
+	height: 16px;
+	position: absolute;
+	right: 6px;
+	top: 6px;
+	cursor: pointer;
+}
+.ke-dialog-body {
+	font: 12px/1.5 "sans serif",tahoma,verdana,helvetica;
+	text-align: left;
+	overflow: hidden;
+	width: 100%;
+}
+.ke-dialog-body textarea {
+	display: block;
+	overflow: auto;
+	padding: 0;
+	resize: none;
+}
+.ke-dialog-body textarea:focus,
+.ke-dialog-body input:focus,
+.ke-dialog-body select:focus {
+	outline: none;
+}
+.ke-dialog-body label {
+	margin-right: 10px;
+	cursor: pointer;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-dialog-body img {
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-dialog-body select {
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+	width: auto;
+}
+.ke-dialog-body .ke-textarea {
+	display: block;
+	width: 408px;
+	height: 260px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+}
+.ke-dialog-body .ke-form {
+	margin: 0;
+	padding: 0;
+}
+.ke-dialog-loading {
+	position: absolute;
+	top: 0;
+	left: 1px;
+	z-index: 1;
+	text-align: center;
+}
+.ke-dialog-loading-content {
+	background: url("../common/loading.gif") no-repeat;
+    color: #666;
+    font-size: 14px;
+    font-weight: bold;
+    height: 31px;
+    line-height: 31px;
+    padding-left: 36px;
+}
+.ke-dialog-row {
+	margin-bottom: 10px;
+}
+.ke-dialog-footer {
+	font: 12px/1 "sans serif",tahoma,verdana,helvetica;
+	text-align: right;
+	padding:0 0 5px 0;
+	background-color: #FFF;
+	width: 100%;
+}
+.ke-dialog-preview,
+.ke-dialog-yes {
+	margin: 5px;
+}
+.ke-dialog-no {
+	margin: 5px 10px 5px 5px;
+}
+.ke-dialog-mask {
+	background-color:#FFF;
+	filter:alpha(opacity=50);
+	opacity:0.5;
+}
+.ke-button-common {
+	background: url(background.png) no-repeat scroll 0 -25px transparent;
+	cursor: pointer;
+	height: 23px;
+	line-height: 23px;
+	overflow: visible;
+	display: inline-block;
+	vertical-align: top;
+	cursor: pointer;
+}
+.ke-button-outer {
+	background-position: 0 -25px;
+	padding: 0;
+	position: relative;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-button {
+	background-position: right -25px;
+	padding: 0 12px;
+	margin: 0;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	border: 0 none;
+	color: #333;
+	font-size: 12px;
+	left: 2px;
+	text-decoration: none;
+}
+/* inputbox */
+.ke-input-text {
+	background-color:#FFFFFF;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	line-height: 17px;
+	height: 17px;
+	padding: 2px 4px;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-input-number {
+	width: 50px;
+}
+.ke-input-color {
+	border: 1px solid #A0A0A0;
+	background-color: #FFFFFF;
+	font-size: 12px;
+	width: 60px;
+	height: 20px;
+	line-height: 20px;
+	padding-left: 5px;
+	overflow: hidden;
+	cursor: pointer;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-upload-button {
+	position: relative;
+}
+.ke-upload-area {
+	position: relative;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+	*height: 25px;
+}
+.ke-upload-area .ke-upload-file {
+	position: absolute;
+	font-size: 60px;
+	top: 0;
+	right: 0;
+	padding: 0;
+	margin: 0;
+	z-index: 811212;
+	border: 0 none;
+	opacity: 0;
+	filter: alpha(opacity=0);
+}
+/* tabs */
+.ke-tabs {
+	font: 12px/1 "sans serif",tahoma,verdana,helvetica;
+	border-bottom:1px solid #A0A0A0;
+	padding-left:5px;
+	margin-bottom:20px;
+}
+.ke-tabs-ul  {
+	list-style-image:none;
+	list-style-position:outside;
+	list-style-type:none;
+	margin:0;
+	padding:0;
+}
+.ke-tabs-li {
+	position: relative;
+	border: 1px solid #A0A0A0;
+	background-color: #F0F0EE;
+	margin: 0 2px -1px 0;
+	padding: 0 20px;
+	float: left;
+	line-height: 25px;
+	text-align: center;
+	color: #555555;
+	cursor: pointer;
+}
+.ke-tabs-li-selected {
+	background-color: #FFF;
+	border-bottom: 1px solid #FFF;
+	color: #000;
+	cursor: default;
+}
+.ke-tabs-li-on {
+	background-color: #FFF;
+	color: #000;
+}
+/* progressbar */
+.ke-progressbar {
+	position: relative;
+	margin: 0;
+	padding: 0;
+}
+.ke-progressbar-bar {
+	border: 1px solid #6FA5DB;
+	width: 80px;
+	height: 5px;
+	margin: 10px 10px 0 10px;
+	padding: 0;
+}
+.ke-progressbar-bar-inner {
+	width: 0;
+	height: 5px;
+	background-color: #6FA5DB;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+}
+.ke-progressbar-percent {
+	position: absolute;
+	top: 0;
+	left: 40%;
+	display: none;
+}
+/* swfupload */
+.ke-swfupload-top {
+	position: relative;
+	margin-bottom: 10px;
+	_width: 608px;
+}
+.ke-swfupload-button {
+	height: 23px;
+	line-height: 23px;
+}
+.ke-swfupload-desc {
+	padding: 0 10px;
+	height: 23px;
+	line-height: 23px;
+}
+.ke-swfupload-startupload {
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+.ke-swfupload-body {
+	overflow: scroll;
+	background-color:#FFFFFF;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+	width: auto;
+	height: 370px;
+	padding: 5px;
+}
+.ke-swfupload-body .ke-item {
+	width: 100px;
+	margin: 5px;
+}
+.ke-swfupload-body .ke-photo {
+	position: relative;
+	border: 1px solid #DDDDDD;
+	background-color:#FFFFFF;
+	padding: 10px;
+}
+.ke-swfupload-body .ke-delete {
+	display: block;
+	background: url(default.png) no-repeat scroll 0px -688px;
+	width: 16px;
+	height: 16px;
+	position: absolute;
+	right: 0;
+	top: 0;
+	cursor: pointer;
+}
+.ke-swfupload-body .ke-status  {
+	position: absolute;
+	left: 0;
+	bottom: 5px;
+	width: 100px;
+	height: 17px;
+}
+.ke-swfupload-body .ke-message  {
+	width: 100px;
+	text-align: center;
+	overflow: hidden;
+	height:17px;
+}
+.ke-swfupload-body .ke-error  {
+	color: red;
+}
+.ke-swfupload-body .ke-name {
+	width: 100px;
+	text-align: center;
+	overflow: hidden;
+	height:16px;
+}
+.ke-swfupload-body .ke-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+
+/* emoticons */
+.ke-plugin-emoticons {
+	position: relative;
+}
+.ke-plugin-emoticons .ke-preview {
+	position: absolute;
+	text-align: center;
+	margin: 2px;
+	padding: 10px;
+	top: 0;
+	border: 1px solid #A0A0A0;
+	background-color: #FFFFFF;
+	display: none;
+}
+.ke-plugin-emoticons .ke-preview-img {
+	border:0;
+	margin:0;
+	padding:0;
+}
+.ke-plugin-emoticons .ke-table {
+	border:0;
+	margin:0;
+	padding:0;
+	border-collapse:separate;
+}
+.ke-plugin-emoticons .ke-cell {
+	margin:0;
+	padding:1px;
+	border:1px solid #F0F0EE;
+	cursor:pointer;
+}
+.ke-plugin-emoticons .ke-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-plugin-emoticons .ke-img {
+	display:block;
+	background-repeat:no-repeat;
+	overflow:hidden;
+	margin:2px;
+	width:24px;
+	height:24px;
+	margin: 0;
+	padding: 0;
+	border: 0;
+}
+.ke-plugin-emoticons .ke-page {
+	text-align: right;
+	margin: 5px;
+	padding: 0;
+	border: 0;
+	font: 12px/1 "sans serif",tahoma,verdana,helvetica;
+	color: #333;
+	text-decoration: none;
+}
+.ke-plugin-plainpaste-textarea,
+.ke-plugin-wordpaste-iframe {
+	display: block;
+	width: 408px;
+	height: 260px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+}
+/* filemanager */
+.ke-plugin-filemanager-header {
+	width: 100%;
+	margin-bottom: 10px;
+}
+.ke-plugin-filemanager-header .ke-left {
+	float: left;
+}
+.ke-plugin-filemanager-header .ke-right {
+	float: right;
+}
+.ke-plugin-filemanager-body {
+	overflow: scroll;
+	background-color:#FFFFFF;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+	width: auto;
+	height: 370px;
+	padding: 5px;
+}
+.ke-plugin-filemanager-body .ke-item {
+	width: 100px;
+	margin: 5px;
+}
+.ke-plugin-filemanager-body .ke-photo {
+	border: 1px solid #DDDDDD;
+	background-color:#FFFFFF;
+	padding: 10px;
+}
+.ke-plugin-filemanager-body .ke-name {
+	width: 100px;
+	text-align: center;
+	overflow: hidden;
+	height:16px;
+}
+.ke-plugin-filemanager-body .ke-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-plugin-filemanager-body .ke-table {
+	width: 95%;
+	border: 0;
+	margin: 0;
+	padding: 0;
+	border-collapse: separate;
+}
+.ke-plugin-filemanager-body .ke-table .ke-cell {
+	margin: 0;
+	padding: 0;
+	border: 0;
+}
+.ke-plugin-filemanager-body .ke-table .ke-name {
+	width: 55%;
+	text-align: left;
+}
+.ke-plugin-filemanager-body .ke-table .ke-size {
+	width: 15%;
+	text-align: left;
+}
+.ke-plugin-filemanager-body .ke-table .ke-datetime {
+	width: 30%;
+	text-align: center;
+}
+
diff --git a/public/assets/kindeditor/themes/default/default.png b/public/assets/kindeditor/themes/default/default.png
new file mode 100644
index 000000000..cc9e72d2b
Binary files /dev/null and b/public/assets/kindeditor/themes/default/default.png differ
diff --git a/public/assets/kindeditor/themes/qq/editor.gif b/public/assets/kindeditor/themes/qq/editor.gif
new file mode 100644
index 000000000..b256841f3
Binary files /dev/null and b/public/assets/kindeditor/themes/qq/editor.gif differ
diff --git a/public/assets/kindeditor/themes/qq/qq.css b/public/assets/kindeditor/themes/qq/qq.css
new file mode 100644
index 000000000..a45e08c69
--- /dev/null
+++ b/public/assets/kindeditor/themes/qq/qq.css
@@ -0,0 +1,143 @@
+/* container */
+.ke-container-qq {
+	display: block;
+	border: 1px solid #c3c3c3;
+	background-color: #FFF;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+}
+/* toolbar */
+.ke-container-qq .ke-toolbar {
+	border-bottom: 1px solid #c3c3c3;
+	background-color: #FFFFFF;
+	padding: 2px 5px;
+	text-align: left;
+	overflow: hidden;
+	zoom: 1;
+}
+.ke-toolbar-icon-url {
+	background-image: url(editor.gif);
+	width:18px;
+	*xwidth:20px;
+	height:18px;
+	*xheight:20px;
+}
+.ke-icon-checked{
+	background-image: url(../default/default.png);
+	width:16px;
+	height:16px;
+}
+.ke-container-qq .ke-icon-bold{
+	background-position: 4px 1px;
+}
+.ke-container-qq .ke-icon-italic{
+	background-position: -27px 1px;
+}
+.ke-container-qq .ke-icon-italic{
+	background-position: -28px 1px;
+}
+.ke-container-qq .ke-icon-underline{
+	background-position: -60px 1px;
+}
+.ke-container-qq .ke-icon-fontname{
+	background-position: -95px 1px;
+}
+.ke-container-qq .ke-icon-fontsize{
+	background-position: -128px 1px;
+}
+.ke-container-qq .ke-icon-forecolor{
+	background-position: -159px 1px;
+}
+.ke-container-qq .ke-icon-hilitecolor{
+	background-position: -190px 1px;
+}
+.ke-container-qq .ke-icon-plug-align{
+	background-position: -223px 1px;
+}
+.plug-align-justifyleft{
+	background-position: -350px 1px;
+}
+.plug-align-justifycenter{
+	background-position: -382px 1px;
+}
+.plug-align-justifyright{
+	background-position: -414px 1px;
+}
+.plug-order-insertorderedlist{
+	background-position: -446px 1px;
+}
+.plug-order-insertunorderedlist{
+	background-position: -477px 1px;
+}
+.plug-indent-indent{
+	background-position: -513px 1px;
+}
+.plug-indent-outdent{
+	background-position: -545px 1px;
+}
+.ke-container-qq .ke-icon-plug-order{
+	background-position: -255px 1px;
+}
+.ke-container-qq .ke-icon-plug-indent{
+	background-position: -287px 1px;
+}
+.ke-container-qq .ke-icon-link{
+	background-position: -319px 1px;
+}
+
+.ke-container-qq .ke-toolbar .ke-outline {
+	cursor: default;
+	padding:0px;
+	border:1px solid #fff;
+}
+.ke-container-qq .ke-toolbar .ke-on {
+	border-left:1px solid white;
+	border-top:1px solid white;
+	border-right:1px solid gray;
+	border-bottom:1px solid gray;
+	background-color: #FFFFFF;
+}
+.ke-container-qq .ke-toolbar .ke-selected {
+	border-left:1px solid gray;
+	border-top:1px solid gray;
+	border-right:1px solid white;
+	border-bottom:1px solid white;
+	background-color: #FFFFFF;
+}
+.ke-container-qq .ke-toolbar  .ke-disabled {
+	cursor: default;
+}
+
+.ke-colorpicker-qq{
+	background:#fff;
+}
+/* statusbar */
+.ke-container-qq .ke-statusbar {
+	display:none;
+}
+/* menu */
+.ke-menu-qq {
+	border:1px solid #a6a6a6;
+	position:absolute;
+	background:#fff;
+	-moz-box-shadow:2px 2px 4px #DDDDDD;
+	z-index:999;
+	left:-400px;
+	top:-386px;
+	right:218px;
+	width:130px;
+}
+.ke-menu-qq .ke-menu-item {
+	padding:0px;
+	background:#fff;
+}
+.ke-menu-qq .ke-menu-item-on {
+	border:1px solid #000080;background:#FFEEC2;color:#036;
+}
+.ke-menu-qq .ke-toolbar .ke-selected {
+	border:1px solid #9a9afb;
+}
+.ke-menu-qq .ke-menu-item-left{
+	width:auto;
+}
diff --git a/public/assets/kindeditor/themes/simple/simple.css b/public/assets/kindeditor/themes/simple/simple.css
new file mode 100644
index 000000000..4c76cf9d7
--- /dev/null
+++ b/public/assets/kindeditor/themes/simple/simple.css
@@ -0,0 +1,100 @@
+/* container */
+.ke-container-simple {
+	display: block;
+	border: 1px solid #CCC;
+	background-color: #FFF;
+	overflow: hidden;
+}
+/* toolbar */
+.ke-container-simple .ke-toolbar {
+	border-bottom: 1px solid #CCC;
+	background-color: #FFF;
+	padding: 2px 5px;
+	overflow: hidden;
+}
+.ke-container-simple .ke-toolbar .ke-outline {
+	border: 1px solid #FFF;
+	background-color: transparent;
+	margin: 1px;
+	padding: 1px 2px;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	cursor: pointer;
+}
+.ke-container-simple .ke-toolbar .ke-on {
+	border: 1px solid #5690D2;
+}
+.ke-container-simple .ke-toolbar .ke-selected {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-container-simple .ke-toolbar  .ke-disabled {
+	cursor: default;
+}
+/* statusbar */
+.ke-container-simple .ke-statusbar {
+	position: relative;
+	background-color: #FFF;
+	border-top: 1px solid #CCCCCC;
+	font-size: 0;
+	line-height: 0;
+	*height: 12px;
+	overflow: hidden;
+	text-align: center;
+	cursor: s-resize;
+}
+/* menu */
+.ke-menu-simple {
+	border: 1px solid #A0A0A0;
+	background-color: #FFF;
+	color: #222222;
+	padding: 2px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	text-align: left;
+	overflow: hidden;
+}
+.ke-menu-simple .ke-menu-item {
+	border: 1px solid #FFF;
+	background-color: #FFF;
+	color: #222222;
+	height: 24px;
+	overflow: hidden;
+	cursor: pointer;
+}
+.ke-menu-simple .ke-menu-item-on {
+	border: 1px solid #5690D2;
+	background-color: #FFF;
+}
+/* colorpicker */
+.ke-colorpicker-simple {
+	border: 1px solid #A0A0A0;
+	background-color: #FEFEFE;
+	color: #222222;
+	padding: 2px;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell {
+	font-size: 0;
+	line-height: 0;
+	border: 1px solid #FEFEFE;
+	cursor: pointer;
+	margin:3px;
+	padding:0;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell-top {
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	line-height: 24px;
+	border: 1px solid #FEFEFE;
+	cursor: pointer;
+	margin:0;
+	padding:0;
+	text-align: center;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell-on {
+	border: 1px solid #5690D2;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell-selected {
+	border: 1px solid #2446AB;
+}
diff --git a/public/images/sidebar_bg.png b/public/images/sidebar_bg.png
index cc57f3870..014b14466 100644
Binary files a/public/images/sidebar_bg.png and b/public/images/sidebar_bg.png differ
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index 8ea71909b..8fbaa5981 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -135,8 +135,11 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) {
     loadstartEventHandler: $.noop,
     progressEventHandler: $.noop
   }, options);
-
-  uploadUrl = uploadUrl + '?attachment_id=' + attachmentId;
+  if(uploadUrl.indexOf('?') > 0){
+      uploadUrl = uploadUrl + '&attachment_id=' + attachmentId;
+  }else{
+    uploadUrl = uploadUrl + '?attachment_id=' + attachmentId;
+  }
   if (blob instanceof window.File) {
     uploadUrl += '&filename=' + encodeURIComponent(blob.name);
   }
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 5786c5758..ca8f0c3b6 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -13,7 +13,7 @@ ul.wlist{ margin-left: -40px; border-bottom:none; }
 ul.wlist li{float: left;}
 ul.wlist li a{ border:1px solid #15bccf; padding:4px; margin-left:3px;}
 ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
-.wlist_select { background-color:#64bdd9; color:#fff; padding: 4px 3px 3px 3px; margin-left:3px;margin-top: -5px; border:1px solid #64bdd9;}
+.wlist_select { background-color:#64bdd9; color:#fff; padding: 5px 3px 3px 3px; margin-left:3px;margin-top: 0px; border:1px solid #64bdd9;}
 
 /*20150203项目界面优化样式  By: huangjignquan*/
 .project_new{font-size: 15px; padding: 5px;}
@@ -69,15 +69,23 @@ a.ml105{ margin-left:120px;}
 a:hover.subnav_green{ background:#14ad5a;}
 
 /*简介*/
-.project_intro{ width:220px; padding:10px; background:#fff; padding-top:5px; color:#6d6d6d;}
-.course_description{max-height: 105px;overflow:hidden;}
+.project_intro{ width:220px; padding:5px 0px 10px 10px; background:#fff; color:#6d6d6d;}
+.course_description{max-height: 103px;overflow:hidden;}
 .course_description_none{max-height: none;}
 .lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;}
 .lg-foot:hover{ color:#787b7e;}
+/****标签(和资源库的tag样式一致)***/
+.project_Label{ width:220px; padding-left:10px; padding-right:10px; background:#fff; margin-top:10px;}
+a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
+.submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat  0 0;width:42px; margin-top:2px; margin-left:3px; }
+.isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;}
+.re_tag{ width: auto; padding-left:4px;padding-right: 4px; height:22px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px;font-size:12px;  }
+.re_tag a{ color:#0d90c3;}
+.tag_h span,.tag_h a{ margin-top:5px;}
 /*右侧内容--动态*/
-
-.project_r_h{ height:40px; background:#eaeaea; margin-bottom: 5px;}
-.project_h2{ background:#64bdd9; color:#fff; height:30px; width:90px; text-align:center; font-weight:normal; padding-top:3px; font-size:16px; padding-top:9px;}
+/*右侧内容--动态*/
+.project_r_h{height:40px; background:#eaeaea; margin-bottom:10px;}
+.project_h2{ background:#64bdd9; color:#fff; height:29px; width:90px; text-align:center; font-weight:normal; padding-top:10px; font-size:16px;padding-left:10px;}
 .project_r_box{ border:1px solid #e2e1e1; width:670px; margin-top:10px;}
 .project_h3 { color:#646464; font-size:14px; padding:0 10px; border-bottom:1px solid #e2e1e1;}
 a.more{ float:right; font-size:12px; font-weight:normal; color:#a9a9a9; margin-top:3px;}
@@ -100,42 +108,124 @@ a:hover.more{ color:#64bdd9;}
 .box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}
 .box_close:hover{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 /*邮件邀请*/
-.box_main{ width:345px; margin:0 auto;padding-left:28px;}
-.box_h3{ color:#15bccf; text-align:center; font-size:16px;margin-right:40px;}
+.box_main{ width:345px; margin:0 auto;}
+.box_main02{ width:390px; margin:15px auto;}
+.box_h3{ color:#15bccf; text-align:center; font-size:16px;}
 .box_p{ color:#404040; margin-bottom:5px;}
-.fb_item{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:10px; padding-left:5px; width:290px;}
+.fb_item{ color:#919191; border:1px solid #919191; height:25px; margin-bottom:10px; padding-left:5px; width:290px;}
 .icon_addm{ background:url(../images/img_floatbox.png) 0 -33px no-repeat; width:16px; height:16px; display:block;  margin:5px 0 0 5px;}
 .icon_addm:hover{background:url(../images/img_floatbox.png) 0 -61px no-repeat; }
 .icon_removem{ background:url(../images/img_floatbox.png) -22px -33px  no-repeat;width:16px; height:16px; display:block;  margin:5px 0 0 5px}
 .icon_removem:hover{background:url(../images/img_floatbox.png) -22px -61px  no-repeat;}
-.btn_free{ background:#ff5722; display:block; width:80px; text-align:center; color:#fff !important; height:26px; padding-top:8px; margin-bottom:10px;}
-.btn_free:hover{ background:#d63502;}
+.btn_free{ background:#ff5722; display:block; width:80px; text-align:center; color:#fff !important; height:25px; padding-top:5px; margin-bottom:10px;}
+.btn_free:hover{ background:#d63502;text-decoration:none;}
 /*成员邀请*/
-.invi_search{ width:345px; margin:0 auto;}
-.invi_search_input{ border:1px solid #15bccf; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;}
+.invi_search{ margin-left:25px;}
+.invi_search_input{ border:1px solid #15bccf; width:180px; height:24px; color:#9b9b9b; padding-left:5px;}
 .invi_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;}
 .invi_search_btn:hover{ background:#0da1b2; border:1px solid #0da1b2;}
-.rolebox{ margin-left: -40px;}
+.rolebox{ margin:10px 0;margin-left:-38px;}
 /*问题跟踪*/
 .problem_top{ margin:10px 0 ;}
 .problem_search_input{ border:1px solid #64bdd9; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;}
 .problem_search_btn{ background:#64bdd9; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #64bdd9; padding-top:2px; cursor:pointer;}
 .problem_search_btn:hover{ background:#3da1c1; border:1px solid #3da1c1;}
-.problem_new_btn{ margin-left:10px; border:1px solid #ff7143; color:#ff7143; width:60px; height:22px; text-align:center; padding-top:2px;}
-.problem_new_btn:hover{ background:#ff7143; color:#fff;}
-.problem_p{ color:#535252; margin-right: 8px;}
+.problem_new_btn{ margin-left:10px; border:1px solid #ff7143; color:#ff7143 !important; width:60px; height:19px; font-size:12px; text-align:center; padding-top:4px;margin-top:-2px;}
+.problem_new_btn:hover{ background:#ff7143; color:#fff !important;}
+.problem_p{ color:#535252; margin-top:5px;}
 .problem_p span{ color:#ff3e00;}
-.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3;}
+.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3; margin-top:5px;}
+.problem_pic:hover{border:1px solid #64bdd9;}
+.problem_txt{ width:610px; margin-left:10px; color:#777777;}
+.problem_name{ color:#ff5722 !important;}
+.problem_line{margin-top:5px;}
+.problem_name:hover{ color:#d33503;}
+.problem_tit{ color:#0781b4 !important; width:430px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.problem_tit:hover{ color:#09658c !important; }
+.problem_main{ border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
+/****翻页***/
+.wlist{}
+.wlist a{ float:right; border:1px solid #64bdd9; padding:0 5px; margin-left:3px; color:#64bdd9;}
+.wlist_l a{ float:left; margin-right:3px; margin-left:0px;}
+.wlist a:hover{border:1px solid #64bdd9; background-color:#64bdd9; color:#fff; text-decoration:none;}
+.wlist_select a { background-color:#48aac9; color:#fff;}
+/****讨论区***/
+.talk_top{ margin:10px 0; font-size:14px; color:#4c4c4c;}
+.talk_top span{ color:#ff7143;}
+.talk_txt{ width:460px; margin-left:10px; color:#676868;}
+.talk_up{ color:#f63c00;}
+.talk_pic{width:32px; height:32px; padding:2px;}
+.talk_btn{ background:#64bdd9; width:50px; height:22px; color:#fff; text-align:center; margin-top:9px; padding-top:2px;}
+.talk_btn:hover{ background:#2a9dc1;}
+/****讨论区内页***/
+.mt0{ margin-top:0px;}
+.talk_info{ color:#7d7d7d; margin-left:50px; margin-top:10px;}
+.talk_edit{ color:#426e9a; margin-right:5px;}
+.talk_edit:hover{ color:#ff5722;}
+.talk_reply { background:#eeeeee; padding:10px; margin-bottom:10px;}
+.talkpage_text{  border:1px solid #64bdd9; width:600px; color:#7d7d7d; padding:5px; margin:10px 0 10px 50px;}
+/****新建讨论***/
+.talk_new{ padding-left:15px; color:#4c4c4c;}
+.c_red{ color:#F00;}
+.talk_input{ border:1px solid #64bdd9; height:22px; width:595px; margin-bottom:10px;}
+.talk_text{ border:1px solid #64bdd9; height:100px;width:595px; margin-bottom:10px;}
+.talk_new ul li{ }
+.view_span{font-weight:normal; color:#999;}
+.sb{width:70px; height:26px; color:#606060;}
+.ml60{ margin-left:60px;}
+.blue_btn{ background:#64bdd9; display:block; font-size:14px;color:#fff; height:28px; width:50px; text-align:center; margin-left:10px; margin-top:10px;}
+.blue_btn:hover{ background:#329cbd;}
+.grey_btn{ background:#d9d9d9; color:#656565;}
+.grey_btn:hover{ background:#717171; color:#fff;}
+/****资源库***/
+.f_l{ float:left;}
+.f_r{ float:right;}
+.resource a{ text-align:center;}
+.b_lblue{ background:#64bdd9;}
+.b_dblue{ background:#55a1b9; cursor:pointer;}
+.f_b{ font-weight: bold;}
+.c_blue{ color:#64bdd9;}
+a.c_dblue{ color: #3ca5c6;}
+a:hover.c_dblue{ color: #0781b4;}
+.c_grey{ color:#999999;}
+.c_grey02{ color:#666666;}
+.f_14{ font-size:14px;}
+.c_dblue{ color:#3e6d8e;}
+.w90{width:90px;}
+.ml10{margin-left:10px;}
+.resource{  width:670px;}
+.re_top{width:660px; height:40px; background:#eaeaea; padding:5px;}
+.re_top input{ float:left;}
+.re_search{ margin-top:7px; margin-left:5px;}
+.re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;}
+.re_schbtn{ width:60px; height:26px;  color:#fff; margin-right:5px; border:none;  margin-left:0px; }
+a.re_fabu { display:block; width:90px; height:35px; font-size:14px; color:#fff; text-align:center; padding-top:5px; }
+a:hover.re_fabu{background:#55a1b9;}
+.re_con{ margin:5px; width:665px;}
+.re_con_top{color:#494949; }
+.re_con_top span{ color:#999999; font-weight:bold;}
+a.re_select{ display:block; width:88px; height:22px; border:1px solid #ff9900; color:#ff9900;  margin-left:10px;}
+a:hover.re_select{ background:#ff9900; color:#fff; text-decoration:none;}
+.re_open{display:block; width:46px; height:22px; border:1px solid #64bdd9; color:#64bdd9;  margin-left:10px;}
+a:hover.re_open{ background:#64bdd9; color:#fff; text-decoration:none;}
+a.re_de{ color:#6883b6; margin-left:15px;}
+.re_con_box{ border-bottom:1px dashed #dadada; padding-bottom:10px; margin-bottom:10px;}
+
+.upload_con { }
+.upload_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto;  margin-top:25px; padding-left:20px; padding-top:5px;}
+.upload_box{ width:430px; height:80px;}
+a.upload_btn02{ display:block; float:left; margin-top:15px; width:80px; height:30px; text-align: center; color:#fff; font-size:14px; background:#15bccf; margin-right:15px;}
+a:hover.upload_btn02{ background:#55a1b9;}
+a.upload_btn_grey{background:#a3a3a3;}
+a:hover.upload_btn_grey{background:#8a8a8a;}
+.upload_btn{width:80px; height:26px;}
+.upload_check{ margin-top:4px;}
+/****其他未更新页面***/
+.setting{ background:url(../images/setting.jpg) 0 0 no-repeat; width:670px; height:443px;}
+.newproblem{}
+
 
 
-/****标签(和资源库的tag样式一致)***/
-.project_Label{ width:220px; padding:10px; background:#fff; margin-top:0px;  padding-top:5px;}
-a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
-.submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat  0 0;width:42px; margin-top:2px; margin-left:3px; }
-.isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;}
-.re_tag{ width: auto; padding:0 5px; height:22px; border:1px solid #f8df8c; background:#fffce6; margin-right:10px; }
-.re_tag a{ color:#0d90c3;}
-.tag_h span,.tag_h a{ margin-bottom:0px;}
 /*企业版样式*/
 .content_syqy{ width:940px; height:400px; border:1px;}
 .content_syqy .list{ font-size:14px; font-weight:normal; margin-left:10px; font-weight:bold; padding-top:10px}
@@ -1414,8 +1504,8 @@ input#openid_url { background: url(../images/openid-bg.gif) no-repeat; backgroun
 .clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
 
 /***** Links *****/
-a, a:link, a:visited{ color: #169 ; text-decoration: none; }
-a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
+a, a:link, a:visited{ color: #0781B4 ; text-decoration: none; }
+a:hover, a:active{ color: #09658c;}
 a img{ border: 0; }
 
 a.issue.closed, a.issue.closed:link, a.issue.closed:visited { color: #999; text-decoration: line-through; }
@@ -3086,3 +3176,4 @@ input[class~='m3p10'], .m3p10 {
 
 }
 */
+
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index 88506989c..6d4cc658e 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -488,7 +488,7 @@ color: #000000;
   background:#fff; /*主题框架背景yanse*/
   margin-bottom: 30px;
   border-right:1px solid #C6E9F1;
-  overflow:auto;
+  /*overflow:auto;*/
   word-wrap:break-word;
   /*by young*/
   -moz-box-shadow:#C6E9F1 1px 1px 2px;