Merge branch 'master' of https://github.com/Protovision/io-lua

Conflicts:
	code/common/mem.c