Fix regression in leveldb backend
Don't unload blocks if save failed

Improve error handling in saveBlock()
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
Remove math mapgen
Remove indev mapgen
Remove proller from credits
Merge commit '8b3ed78'

Conflicts:
	src/database-leveldb.cpp
	src/database.h
	src/map.cpp
	src/map.h
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
Merge commit '2d90aca'

Conflicts:
	freeminer.conf.example
	src/defaultsettings.cpp
	src/emerge.cpp
	src/mapgen_indev.cpp
	src/mapgen_indev.h
	src/mapgen_math.cpp
	src/mapgen_math.h
Merge remote-tracking branch 'minetest/master'
remove mail
Merge remote-tracking branch 'upstream/master' into next

Conflicts:
	CMakeLists.txt