Merge branch 'hotfix/frame_rate_fix'
folder moved
Merge branch 'hotfix/separate_editor_classes' into develop