Localization and guiOptions
Merge branch 'NewMaster' into GUI