PROGRAM, TRAINING, DATABASE
Merge branch 'master' of https://github.com/hscstudio/syawwal

Conflicts:
	backend/models/TrainingUnitPlan.php