change version
make lua works ok on iOS
issue #2257: make ios template work
issue #2257:change copyright of template
fixed conflict
Merge pull request #2762 from minggo/modify-ios-template

Modify ios template
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into pirates