text update
Merge branch '2013campus'