Merge branch 'master' of https://github.com/appxyz/appxyz.github.io

Conflicts:
	daijia/vdaijia.apk