Merge branch '1.5-development' into 1.5-stable
Merge branch '1.5-development' into 1.5-stable
Merge branch 'master' into 1.5-stable
Merge branch 'master' into 1.5-stable
Merge branch 'master' into 1.5-stable
Merge branch 'cmake-1.5-development' into 1.5-stable
Merge branch 'master' into 1.5-stable
Merge pull request #937 from moai/master

Synchronization of the branch.
resolved vfs not working on ios with luajit
Merge pull request #969 from moaiforge/pull_luajit_vfs_ios_fix

resolved vfs not working on ios with luajit
Merge pull request #971 from moai/1.5-stable

1.5 stable fixes