Fix tests for exceptions
Add custom template to tree
Merge remote-tracking branch 'origin/development' into xml-editor