Merge branch 'yamdev' into fusion

# Conflicts:
#	database/migrations/2025_02_18_090801_create_classes_table.php
#	database/seeders/DatabaseSeeder.php
#	resources/views/pages/payment/detail.blade.php
