Merge branch 'eval1'
Merge branch 'december-fest'
webroster text fixed
Merge branch 'master' into december-fest