Fix typo.[ci skip]
Merge branch 'master' of https://github.com/urho3d/Urho3D
Merge branch 'master' of https://github.com/urho3d/Urho3D
Merge branch 'master' of https://github.com/urho3d/Urho3D
Merge branch 'master' of https://github.com/urho3d/Urho3D
Add name and type support for tile map objects.
Travis CI: API documentation update at 2014-08-23 13:06:49 UTC.
[ci package]
For Travis CI - switch CI build to use OS X build environment.