Fixed warning; renamed lua state functions
Merge branch 'develop' into dev-lua
Merge branch 'dev-lua' into develop