Merge pull request #359 from hhovsepy/master

refactorings, some fixes and comments
Added test for ID 194305
Merge pull request #360 from tkolhar/master

Added test for ID 194305
Merge pull request #361 from hhovsepy/master

added new template class
adjusting spaces.
added new automation case for errara filtering in content definitions