更新统计api
Merge branch 'master' of https://github.com/gabrieltong/rails-wanguo

Conflicts:
	app/controllers/api_controller.rb
	app/models/history.rb
	app/models/istudy.rb
	config/routes.rb