schedule-update
Merge branch 'develop' into schedule-update-request

Conflicts:
	app/controllers/ClassScheduleController.php
	app/controllers/CountriesController.php
	app/models/ClassSchedule.php
Merge pull request #12 from tintinboss/schedule-update-request

schedule-update