Merge branch '20141124-annual-report'
update suej
Merge branch 'suejedit'
Added spring and intersession hours to website
Merge branch '20141124-hours' into staging