Internal update
Internal update
Merged from dev
More Xcode 5 ignores
Fixed merge conflicts
Removed userdata