them phan validate

them phan validate
Merge remote-tracking branch 'origin/working' into working

Conflicts:
	app/Controller/AdminsController.php