test
remove test
Merge branch 'xiaolong'
added cache
Merge branch 'xiaolong'

Conflicts:
	app/controllers/api/dailyposts_controller.rb
	lib/tasks/upload.rake
	modified:   Gemfile
	modified:   config/environments/production.rb
	modified:   Gemfile.lock
hotfix cache
	modified:   config/environments/development.rb
	modified:   config/environments/production.rb
	modified:   config/environments/development.rb
	modified:   config/environments/production.rb
	modified:   app/controllers/api/dailyposts_controller.rb
remove cache
合并merge