Longclick and working triggers
Merge remote-tracking branch 'dswd/master'
Merge branch 'working_editor'