Merge pull request #294 from maciejlew/master

Groups templates in subdirectories
remove $this call
Fixes comments in cashimport config