modified Makefile and other errors
Merge branch 'block-trans-to-lua-13-10-11' of https://github.com/yison/giraffe into block-trans-to-lua-13-10-11