NCCU 上傳版本 0709

Merge branch 'nccu0621'

Conflicts:
	Gemfile
	config/resque.god
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb

Gemfile

@@ -29,11 +29,12 @@ gem 'resque-restriction'
 #gem 'rb-readline'
 gem 'ruby-debug19'
 gem 'rubyzip'
-gem 'therubyracer'
 gem 'sinatra'
 gem 'sprockets'
 gem 'tinymce-rails'
 gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
+gem 'rb-readline' if RUBY_PLATFORM.downcase.include?("linux")
+
 
 gem "impressionist", :require => "impressionist", :path => "vendor/impressionist"