Merge branch 'master' into develop
Fixing #86
Merge branch 'develop' into f_schedulequarters
Fixing #53, part 2
Merge branch 'f_schedulequarters' into develop
Merge branch 'develop'