Merge remote-tracking branch 'origin/dev'
bug in content.lua fixed.
Merge branch 'fix-fug-in-content' into dev