solve tips
Merge branch '2013campus'