Merge branch 'develop'
Merge branch 'master' of https://github.com/ComputerScienceHouse/schedulemaker.git
Merge branch 'master' into develop