Merge pull request #2133 from dumganhar/master

Fixed compilation error for MAC port.
Updated iOS template.