UPDATE MODULES PLANNING & DATABASE
Merge remote-tracking branch 'origin/master'

Conflicts:
	backend/models/Training.php
	syawwal.sql