Merge branch 'zhengshijun'
aa
Merge branch 'zhengshijun'
fix 转场bug
转换动画稳定版8.0
touch 1.0
mm
Merge branch 'zhengshijun'

Conflicts:
	js/view/vehicle_PajeroSport.js
	lbi/vehicle_p_5zxhd.lbi
	style/common.css
改进loading样式
Merge remote-tracking branch 'origin/master' into zhengshijun