fixed issues with IOS and its usage of resource folder instead of zip archive
Merge remote-tracking branch 'origin/master'