Merge branch 'master' of https://github.com/xuwenguang/IPadWall

Conflicts:
	UnityProject/Client/Assets/Scene/Main.unity
update VTP