resource updated
Merge branch 'master' of https://github.com/wangyanxing/Beans

Conflicts:
	Resources/speed_eff_line.png