ANother merge from upstream
Merge branch 'c++11' of github.com:nemerle/Urho3D into c++11

Conflicts:
	Source/Engine/Scene/Scene.cpp
	Source/Engine/Urho2D/Renderer2D.cpp