modify
modify
Merge pull request #206 from htlxyz/framework_test

Framework test
removed some debug codes
Merge commit 'eb406f3ba291bf6200ca95df7c215f60c4f7086b' into framework_test

Conflicts:
	tests/lua-empty-test/src/framework/display.lua
Merge branch 'framework_test' into workBranch