Big commit, view, profile....
Merge remote-tracking branch 'origin/master'

Conflicts:
	controller/viewController.php
	template/thuviengiaoduc/view-doc.php