xingtianlun
Merge branch 'xtl'

Conflicts:
	source/routes/vpsIndex.js
xingtianlun