Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/news.php
fix some errors
add some ability
add & fix some