Merge branch 'master' of https://github.com/huazhonglong/ikickz

Conflicts:
	ZJdemo/.DS_Store
qaa