加上cookie

加上cookie
Merge remote-tracking branch 'origin/master'

Conflicts:
	Application/Home/View/Index/helper.html