Merge branch 'master' of github.com:Rulingcom/NCCU

Conflicts:
	config/initializers/resque.rb

config/initializers/resque.rb

@@ -1,9 +1,9 @@
 require 'resque_scheduler'
-# require 'resque_scheduler/server'
+require 'resque_scheduler/server'
 # require 'yaml'
 
 Resque.redis = 'localhost:6379'
-Resque.redis.namespace = "resque:nccu_stage"
+Resque.redis.namespace = "resque"
 
 # If you want to be able to dynamically change the schedule,
 # uncomment this line.  A dynamic schedule can be updated via the