Merge branch 'master' of https://github.com/DarkstarProject/darkstar into misc

(Resolved) Conflicts:
	src/map/lua/lua_baseentity.cpp
	src/map/lua/lua_baseentity.h