Commented most of home
Merge branch 'web2.0'