Merge remote-tracking branch 'origin/master'

Conflicts:
	_Doc/HTML/header_login.php
	_Doc/HTML/html_hocvui/detail.html
	_Doc/HTML/html_hocvui_v1_04.rar
	_Doc/HTML/resources/css/style.css