Merge branch 'master' into dev
* fixed an issue with grabbing world names instead of world folder names in FileHelper
Merge branch 'dev'