Removed some deprecated comments
Merge branch 'linnea'
Changed header font
Merge branch 'master' into sara