Merge remote-tracking branch 'origin/master'
phult
Merge remote-tracking branch 'origin/master'

Conflicts:
	_Doc/HTML/html_hocvui/detail.html
	_Doc/HTML/html_hocvui/forget-pass.html
	_Doc/HTML/html_hocvui/login.html
	_Doc/HTML/html_hocvui/login_notsuccess.html
	_Doc/HTML/html_hocvui/login_success.html
	_Doc/HTML/html_hocvui/register_notify.html
	_Doc/HTML/html_hocvui/register_sendmail.html
	_Doc/HTML/html_hocvui/resources/css/style.css
	_Doc/HTML/html_hocvui/resources/images/assess_new_bg.png
Merge remote-tracking branch 'origin/master'

Conflicts:
	_Doc/HTML/html_hocvui/detail.html
	_Doc/HTML/html_hocvui/forget-pass.html
	_Doc/HTML/html_hocvui/login.html
	_Doc/HTML/html_hocvui/login_notsuccess.html
	_Doc/HTML/html_hocvui/login_success.html
	_Doc/HTML/html_hocvui/register_notify.html
	_Doc/HTML/html_hocvui/register_sendmail.html
	_Doc/HTML/html_hocvui/resources/css/style.css
	_Doc/HTML/html_hocvui/resources/images/assess_new_bg.png
Merge remote-tracking branch 'origin/master'

Conflicts:
	_Doc/HTML/html_hocvui/detail.html
	_Doc/HTML/html_hocvui/forget-pass.html
	_Doc/HTML/html_hocvui/login.html
	_Doc/HTML/html_hocvui/login_notsuccess.html
	_Doc/HTML/html_hocvui/login_success.html
	_Doc/HTML/html_hocvui/register_notify.html
	_Doc/HTML/html_hocvui/register_sendmail.html
	_Doc/HTML/html_hocvui/resources/css/style.css
	_Doc/HTML/html_hocvui/resources/images/assess_new_bg.png
phult