Merge branch 'finishSchedule' into dev
Merge branch 'finishSchedule' into dev
Fix ngAnimate and jquery minification bugs. Change sidebar to allow for schedule download
Merge branch 'dev'
Merge branch 'master' into finishSchedule
Convert 14 point system back to 4 point system