a
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/maid/autoCode/bestpricecn/UpdateNews.groovy
       a