update confirm.html
update height of each news box
Merge remote-tracking branch 'origin/master'

Conflicts:
	user/templates/confirm.html