Merge remote-tracking branch 'upstream/master' into cancelevent
Merge branch 'master' into cancelevent
test for reject event
fixed reject event test
Merge pull request #271 from naisnouk/master

test for approve/reject event