Fixed incorrect layout in Settings
Updated version info
Merge branch 'fix2.10' into develop