adding Cal Day 2012 link
Merge branch 'BerkeleyEdu/develop' into BerkeleyEdu/master