测试
Merge remote-tracking branch 'origin/master'

Conflicts:
	LenovoSupply2013-build-en/src/com/martix/lenovo/Version.java