sync
Merge branch 'master' of https://github.com/nhocconvn/trucbach

Conflicts:
	congTrinhDuAn-details.html
	css/site.css
	js/appScript.js