Merge branch 'master' of https://bitbucket.org/phpmaster/school-management into release_2_july

# Conflicts:
#	resources/lang/ar/locale.php
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Committer: Ubuntu <ubuntu@ip-172-31-18-90.ap-south-1.compute.internal>
#
# On branch release_2_july
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   app/Http/Middleware/CheckAccountDomain.php
#	modified:   app/Models/Account.php
#	modified:   app/Modules/Department/Model/Department.php
#	modified:   app/Modules/Designation/Model/Designation.php
#	modified:   app/Modules/Saasuser/Http/Controllers/SaasUserController.php
#	modified:   app/Modules/Saasuser/Http/Controllers/SchoolController.php
#	modified:   app/Modules/Saasuser/Http/Requests/StoreSchool.php
#	modified:   app/Modules/Saasuser/Resources/Views/school/createOrUpdate.blade.php
#	modified:   app/Modules/Staff/Http/Controllers/StaffController.php
#	modified:   app/Modules/Staff/Model/Staff.php
#	modified:   app/Modules/Staff/Requests/Store.php
#	modified:   app/Modules/Staff/Resources/Views/add_edit_form.blade.php
#	modified:   app/Modules/Staff/Resources/Views/index.blade.php
#	modified:   app/Modules/Staff/Routes/web.php
#	modified:   app/Modules/Student/Http/Controllers/StudentController.php
#	modified:   app/Modules/Student/Model/Student.php
#	modified:   app/Modules/Student/Requests/StoreStudent.php
#	modified:   app/Modules/Student/Resources/Views/createOrUpdate.blade.php
#	modified:   app/Modules/Student/Routes/web.php
#	modified:   app/Modules/Timetable/Http/Controllers/TimetableController.php
#	modified:   app/Modules/Timetable/Model/Timetable.php
#	new file:   app/Modules/Timetable/Requests/StoreTimetable.php
#	modified:   app/Modules/Timetable/Resources/Views/eventTitle.blade.php
#	modified:   app/Modules/Timetable/Resources/Views/index.blade.php
#	modified:   app/Modules/Timetable/Routes/web.php
#	modified:   database/migrations/2014_10_12_000000_create_users_table.php
#	modified:   database/migrations/2020_06_14_062617_create_accounts_table.php
#	modified:   database/migrations/2020_06_17_165125_create_staff_table.php
#	modified:   database/migrations/2020_06_18_160815_create_students__table.php
#	modified:   database/migrations/2020_06_28_112205_create_timetables__table.php
#	modified:   database/seeds/AccountSeeder.php
#	modified:   database/seeds/ClassSeeder.php
#	modified:   database/seeds/DepartmentSeeder.php
#	modified:   database/seeds/DesignationSeeder.php
#	modified:   database/seeds/PermissionSeeder.php
#	modified:   database/seeds/SaasUserSeeder.php
#	modified:   database/seeds/SectionSeeder.php
#	modified:   database/seeds/StudentCategorySeeder.php
#	modified:   database/seeds/StudentHouseSeeder.php
#	modified:   database/seeds/StudentSeeder.php
#	modified:   database/seeds/UserSeeder.php
#	modified:   public/assets/js/custom.js
#	modified:   resources/lang/ar/locale.php
#	modified:   resources/lang/en/locale.php
#	modified:   resources/lang/en/ulmsg.php
#	modified:   resources/views/layouts/includes/header.blade.php
#
