Gitignore
Fixed crash on iOS 5
Merge with nightly