Merge remote branch 'origin/master'

.gitignore

CMakeLists.txt

README.txt

builtin/falling.lua

builtin/item.lua

builtin/item_entity.lua

builtin/misc.lua

client/shaders/test_shader_2/opengl_vertex.glsl

cmake/Modules/FindJson.cmake

cmake/Modules/FindOpenGLES2.cmake

doc/lua_api.txt

doc/protocol.txt

games/minimal/mods/default/init.lua

games/minimal/mods/default/mapgen.lua

minetest.conf.example

src/CMakeLists.txt

src/activeobject.h

src/chat.cpp

src/chat.h

src/client.cpp