unnecesary .tpl removed
module ready
Merge branch 'master' into develop