update contribute-2, finish content block.
Merge remote-tracking branch 'origin/master' into production