removed jtella
Merge branch 'master' of github.com:msmolle/swa