添加客户端csrf_token
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/write/_head.html.erb
Merge remote-tracking branch 'origin/master'