update
Merge branch 'master' of https://github.com/HanYu1983/MyCar

Conflicts:
	eclipse/MyCar/WebContent/web/lib/vic.utils.js
update