vps version
Merge branch 'vps' of github.com:dingzg/onepanel into vps

Conflicts:
	static/partials/set_up.html