adds edit user
Merge branch 'master' into trigger_finder
Merge pull request #19 from nairys/trigger_finder

Trigger finder