Better fast turn
Masterserver: Fix undefined players
Make player files saving again
Falling tuned
Make sure none of the irrlicht member objects of GenericCAO are deleted prior deletion of GenericCAO
Add formspec api versioning
Fix msvc2012 build
OS X compatibility fixes
Glasslike_framed drawtype rework.
Don't spam server console on player/playersao error but just drop the affected client
Add support for Android 2.3+

There have been plenty of ppl involved in creating this version.
I don't wanna mention names as I'm sure I'd forget someone so I
just tell where help has been done:
- The partial android versions done by various ppl
- Testing on different android devices
- reviewing code (especially the in core changes)
- testing controls
- reviewing texts

A big thank you to everyone helping this to be completed!
Copy zlib and freetype dll to windows package too
Add redis options to documentation
Masterserver: Fix compiling servers.jst
Merge commit 'ff36071'

Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
	src/environment.cpp
	src/game.cpp
	src/guiFormSpecMenu.cpp
	src/player.cpp
	src/profiler.h
	src/server.cpp
	src/util/string.h
Merge commit '1cc40c0'

Conflicts:
	src/config.h
	src/defaultsettings.cpp
	src/game.cpp
	src/main.cpp
Merge remote-tracking branch 'minetest/master'

Conflicts:
	README.txt
	src/CMakeLists.txt
Merge remote-tracking branch 'upstream/master' into next

Conflicts:
	src/game.cpp
	src/guiFormSpecMenu.cpp
	src/guiFormSpecMenu.h
	src/main.cpp
	src/server.cpp
	src/util/string.cpp
	src/util/string.h