Remove FPS from being next to the version string
Fix typos in doc/lua-api.txt
Merge remote-tracking branch 'minetest/master'

Conflicts:
	doc/lua_api.txt
	src/game.cpp
Merge remote-tracking branch 'upstream/master' into next

Conflicts:
	src/game.cpp