further edits- removed labs and schedule in engineering section
Merge branch 'develop' into staging
Merge branch 'staging'