issue fix
Merge branch 'master' of https://github.com/zoho/creator-ios

Conflicts:
	.DS_Store
issue fix