Don't copy back already generated blocks on map generation
Faces shading fixes
Switch back repository to dev-mode after 0.4.10 release.
Update default control documentation
Merge commit 'a2e1b0f'

Conflicts:
	src/map.cpp
Merge commit 'e69d660'

Conflicts:
	CMakeLists.txt
	README.txt
	client/shaders/water_surface_shader/opengl_vertex.glsl
	src/mapblock_mesh.cpp