Uncommented code, which works with current weaving; all tests passed
set default templates out of jar; updated shell; added test
Merge pull request #51 from georgebyelas/master

Uncommented code, which works with current weaving; all tests passed