changed atom theme
commented out osx guest user settings
Merge branch 'release/1.2'