Updated editor stuff
Merge branch 'master' of https://github.com/admachina/AwesomestTeam-Communication-Aids