build iOS
Merge branch 'master' of https://github.com/IVProductions/Learn

Conflicts:

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/build-state.dat

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Learning-project-headers.hmap

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Learning.dep

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Learning.hmap

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/Learning.LinkFileList

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/Learning_dependency_info.dat

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
build-state.dat

platforms/ios/build/emulator/Learning.app.dSYM/Contents/Resources/DWARF/
Learning
	platforms/ios/build/emulator/Learning.app/Learning
omg