some cleanup
Merge branch 'master' of https://github.com/Vavius/moai-framework
Merge branch 'master' of https://github.com/Vavius/moai-framework