add expand/collapse button
Merge branch 'dev-homepage-master' into for_bashu