v 2.20
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/flexslider.css
	css/styles.css
	index-cn.php
	index.php
	js/scripts.js