Fixed Spelling errors on Preferences
Merging Master into DEV