Fix authenticity_token error in site_controller.rb.
Merge branch 'yang' into dev