Continued working on Lua
Merge remote-tracking branch 'origin/master'

Conflicts:
	project/project.sdf
	project/project.v12.suo
	project/project/Release/vc120.pdb