issue #2905: [iOS Mac] Updating template.
Merge pull request #3958 from dumganhar/iss2905-folder-structure

issue #2905: [iOS Mac] Updating template.
more Xcode fixes
Merge pull request #3959 from ricardoquesada/xcode_fixes

more Xcode fixes
Icons for test projects
Merge pull request #3960 from ricardoquesada/mac_icons

Icons for test projects
issue #2905:TestJavascript build ok on Android
Merge pull request #3961 from minggo/iss2905-adjust_folder

issue #2905:TestJavascript build ok on Android
Added missing icons for some iOS and Mac samples.