More of the same: 'Map' -> 'std::map'
Merge branch 'c++11' of github.com:Ed-von-Schleck/godot into c++11

Conflicts:
	scene/3d/area.cpp