master config
Merge branch '2013campus'
Merge branch '2013campus'
email text update