Merge pull request #137 from shabanovd/develop

Triggers redesign and bugfixes
Merge remote-tracking branch 'eXist/develop' into develop