Merge branch 'development'
Updated descriptions of glav-advanced and intellectual property
Change percentages, fix syntax error on events.json
Added office hours
Added syllabus
new config file and prefs
Merge branch 'master' into development