1.small changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	MVCNews/WebRoot/front/_header.jsp