Grabbing updates
fix up branch
Fix up conflicts
Merge branch 'master' of https://github.com/rarkenin/minetest

Conflicts:
	doc/lua_api.txt
	src/particles.cpp